diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-18 21:03:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 03:52:42 +0000 |
commit | 4a0eda76baeba2d8af2cc57ec64dcead03384cde (patch) | |
tree | 5f5f8a02f3677c9cfee7647a3573b63249980938 /res | |
parent | 1e4359c54e82910e3c8bfba3d520ed27c91367b9 (diff) | |
parent | dcbcc86353e9ed52daac87f292aece667cd0ac71 (diff) | |
download | android_packages_apps_Trebuchet-4a0eda76baeba2d8af2cc57ec64dcead03384cde.tar.gz android_packages_apps_Trebuchet-4a0eda76baeba2d8af2cc57ec64dcead03384cde.tar.bz2 android_packages_apps_Trebuchet-4a0eda76baeba2d8af2cc57ec64dcead03384cde.zip |
Merge "Updating the UI for focused state of an icon/folder." into ub-now-porkchop
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/focused_bg.9.png | bin | 188 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/focused_bg.9.png | bin | 180 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/focused_bg.9.png | bin | 194 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/focused_bg.9.png | bin | 2884 -> 0 bytes | |||
-rw-r--r-- | res/drawable/focusable_view_bg.xml | 13 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 5 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 5 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 5 | ||||
-rw-r--r-- | res/layout/all_apps_button.xml | 3 | ||||
-rw-r--r-- | res/layout/application.xml | 3 | ||||
-rw-r--r-- | res/layout/apps_customize_application.xml | 3 | ||||
-rw-r--r-- | res/layout/folder_application.xml | 3 | ||||
-rw-r--r-- | res/layout/folder_icon.xml | 3 | ||||
-rw-r--r-- | res/values/colors.xml | 1 |
14 files changed, 31 insertions, 13 deletions
diff --git a/res/drawable-hdpi/focused_bg.9.png b/res/drawable-hdpi/focused_bg.9.png Binary files differdeleted file mode 100644 index 2925ae858..000000000 --- a/res/drawable-hdpi/focused_bg.9.png +++ /dev/null diff --git a/res/drawable-mdpi/focused_bg.9.png b/res/drawable-mdpi/focused_bg.9.png Binary files differdeleted file mode 100644 index 89c29ac51..000000000 --- a/res/drawable-mdpi/focused_bg.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/focused_bg.9.png b/res/drawable-xhdpi/focused_bg.9.png Binary files differdeleted file mode 100644 index 197a26988..000000000 --- a/res/drawable-xhdpi/focused_bg.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/focused_bg.9.png b/res/drawable-xxhdpi/focused_bg.9.png Binary files differdeleted file mode 100644 index 84d3062f1..000000000 --- a/res/drawable-xxhdpi/focused_bg.9.png +++ /dev/null diff --git a/res/drawable/focusable_view_bg.xml b/res/drawable/focusable_view_bg.xml index 66661e28b..e156513ef 100644 --- a/res/drawable/focusable_view_bg.xml +++ b/res/drawable/focusable_view_bg.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + Copyright (C) 2011 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,5 +16,11 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:drawable="@drawable/focused_bg" /> -</selector> + + <item android:state_focused="true"> + <shape android:shape="rectangle"> + <solid android:color="@color/focused_background" /> + </shape> + </item> + +</selector>
\ No newline at end of file diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 779160925..0af9e59aa 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -30,6 +30,11 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> + <com.android.launcher3.FocusIndicatorView + android:id="@+id/focus_indicator" + android:layout_width="52dp" + android:layout_height="52dp" /> + <!-- The workspace contains 5 screens of cells --> <com.android.launcher3.Workspace android:id="@+id/workspace" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 574b73e46..46e0c0f4c 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -29,6 +29,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <com.android.launcher3.FocusIndicatorView + android:id="@+id/focus_indicator" + android:layout_width="52dp" + android:layout_height="52dp" /> + <!-- The workspace contains 5 screens of cells --> <com.android.launcher3.Workspace android:id="@+id/workspace" diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 685d03c6f..f8b843773 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -30,6 +30,11 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> + <com.android.launcher3.FocusIndicatorView + android:id="@+id/focus_indicator" + android:layout_width="52dp" + android:layout_height="52dp" /> + <!-- The workspace contains 5 screens of cells --> <com.android.launcher3.Workspace android:id="@+id/workspace" diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml index 1b9ea082f..9d6d82bb2 100644 --- a/res/layout/all_apps_button.xml +++ b/res/layout/all_apps_button.xml @@ -16,5 +16,4 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/application.xml b/res/layout/application.xml index e4909ddad..c21dea070 100644 --- a/res/layout/application.xml +++ b/res/layout/application.xml @@ -16,5 +16,4 @@ <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml index b48b9b7ac..17f4a8e15 100644 --- a/res/layout/apps_customize_application.xml +++ b/res/layout/apps_customize_application.xml @@ -20,5 +20,4 @@ style="@style/WorkspaceIcon.AppsCustomize" android:id="@+id/application_icon" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml index 37dd79d37..b48b61331 100644 --- a/res/layout/folder_application.xml +++ b/res/layout/folder_application.xml @@ -16,5 +16,4 @@ <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Folder" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> + android:focusable="true" /> diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml index 5147f9960..fd45d7685 100644 --- a/res/layout/folder_icon.xml +++ b/res/layout/folder_icon.xml @@ -19,8 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:focusable="true" - android:background="@drawable/focusable_view_bg"> + android:focusable="true" > <ImageView android:id="@+id/preview_background" android:layout_gravity="center_horizontal" diff --git a/res/values/colors.xml b/res/values/colors.xml index 4e64d4184..5e9c6ecec 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -24,6 +24,7 @@ <color name="info_target_hover_tint">#DA0099CC</color> <color name="bubble_dark_background">#20000000</color> + <color name="focused_background">#80c6c5c5</color> <color name="appwidget_error_color">#FCCC</color> |