summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-08-18 21:03:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-16 03:52:42 +0000
commit4a0eda76baeba2d8af2cc57ec64dcead03384cde (patch)
tree5f5f8a02f3677c9cfee7647a3573b63249980938 /res/layout
parent1e4359c54e82910e3c8bfba3d520ed27c91367b9 (diff)
parentdcbcc86353e9ed52daac87f292aece667cd0ac71 (diff)
downloadandroid_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/layout')
-rw-r--r--res/layout/all_apps_button.xml3
-rw-r--r--res/layout/application.xml3
-rw-r--r--res/layout/apps_customize_application.xml3
-rw-r--r--res/layout/folder_application.xml3
-rw-r--r--res/layout/folder_icon.xml3
5 files changed, 5 insertions, 10 deletions
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"