diff options
author | Tony Wickham <twickham@google.com> | 2016-02-10 23:36:42 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-10 23:36:42 +0000 |
commit | 654f1b315f291d745e2fc8e39ef410c88331b771 (patch) | |
tree | 9d970b25899cbb96e61874d1941e2572a6bcf1a1 /src/com/android/launcher3/LauncherAppWidgetHostView.java | |
parent | 7c50b31f57e3e3ec1f433d243afe05554dcaf977 (diff) | |
parent | 4df165333131483e1d6b6c156d345a4aeef9806c (diff) | |
download | android_packages_apps_Trebuchet-654f1b315f291d745e2fc8e39ef410c88331b771.tar.gz android_packages_apps_Trebuchet-654f1b315f291d745e2fc8e39ef410c88331b771.tar.bz2 android_packages_apps_Trebuchet-654f1b315f291d745e2fc8e39ef410c88331b771.zip |
Merge "Change widget host view background when giving focus to child." into ub-launcher3-burnaby-polish
am: 4df1653331
* commit '4df165333131483e1d6b6c156d345a4aeef9806c':
Change widget host view background when giving focus to child.
Diffstat (limited to 'src/com/android/launcher3/LauncherAppWidgetHostView.java')
-rw-r--r-- | src/com/android/launcher3/LauncherAppWidgetHostView.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java index 44cd8743d..f659f45f7 100644 --- a/src/com/android/launcher3/LauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java @@ -58,6 +58,8 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mDragLayer = ((Launcher) context).getDragLayer(); setAccessibilityDelegate(LauncherAppState.getInstance().getAccessibilityDelegate()); + + setBackgroundResource(R.drawable.widget_internal_focus_bg); } @Override @@ -242,6 +244,7 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) { if (gainFocus) { mChildrenFocused = false; + dispatchChildFocus(false); } super.onFocusChanged(gainFocus, direction, previouslyFocusedRect); } @@ -250,6 +253,9 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc public void requestChildFocus(View child, View focused) { super.requestChildFocus(child, focused); dispatchChildFocus(focused != null); + if (focused != null) { + focused.setFocusableInTouchMode(false); + } } @Override @@ -263,10 +269,9 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView implements Touc return mChildrenFocused; } - private void dispatchChildFocus(boolean focused) { - if (getOnFocusChangeListener() != null) { - getOnFocusChangeListener().onFocusChange(this, focused || isFocused()); - } + private void dispatchChildFocus(boolean childIsFocused) { + // The host view's background changes when selected, to indicate the focus is inside. + setSelected(childIsFocused); } @Override |