fix 3053561: Update homescreen icons for all apps, customize
diff --git a/res/drawable-xlarge/all_apps_button_normal.9.png b/res/drawable-xlarge/all_apps_button_normal.9.png
new file mode 100644
index 0000000..a423145
--- /dev/null
+++ b/res/drawable-xlarge/all_apps_button_normal.9.png
Binary files differ
diff --git a/res/drawable-xlarge/all_apps_button_normal.png b/res/drawable-xlarge/all_apps_button_normal.png
deleted file mode 100644
index e1c8b7d..0000000
--- a/res/drawable-xlarge/all_apps_button_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.9.png b/res/drawable-xlarge/all_apps_button_pressed.9.png
new file mode 100644
index 0000000..5dbe77c
--- /dev/null
+++ b/res/drawable-xlarge/all_apps_button_pressed.9.png
Binary files differ
diff --git a/res/drawable-xlarge/all_apps_button_pressed.png b/res/drawable-xlarge/all_apps_button_pressed.png
deleted file mode 100644
index 9dcfaa5..0000000
--- a/res/drawable-xlarge/all_apps_button_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xlarge/configure_button_normal.png b/res/drawable-xlarge/configure_button_normal.png
index b11c2a8..9b37eff 100644
--- a/res/drawable-xlarge/configure_button_normal.png
+++ b/res/drawable-xlarge/configure_button_normal.png
Binary files differ
diff --git a/res/drawable-xlarge/configure_button_pressed.png b/res/drawable-xlarge/configure_button_pressed.png
index 70db9b7..5f38db6 100644
--- a/res/drawable-xlarge/configure_button_pressed.png
+++ b/res/drawable-xlarge/configure_button_pressed.png
Binary files differ
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 9b41af0..2b43442 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -64,14 +64,29 @@
android:clickable="true"/>
<ImageView
- android:id="@+id/all_apps_button"
- android:src="@drawable/all_apps_button"
+ android:id="@+id/configure_button"
+ android:src="@drawable/configure_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/toolbar_button_spacing"
android:layout_marginRight="@dimen/toolbar_button_spacing"
+ android:onClick="onClickConfigureButton"
+ android:focusable="true"
+ android:clickable="true" />
+
+ <TextView
+ android:id="@+id/all_apps_button"
+ android:text="@string/all_apps_button_label"
+ android:background="@drawable/all_apps_button"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_toLeftOf="@id/configure_button"
+ android:layout_marginLeft="@dimen/toolbar_button_spacing"
+ android:layout_marginRight="@dimen/toolbar_button_spacing"
+ android:textSize="18dip"
+
android:onClick="onClickAllAppsButton"
android:focusable="true"
android:clickable="true" />
@@ -89,18 +104,6 @@
android:clickable="false"
android:visibility="gone"/>
- <ImageView
- android:id="@+id/configure_button"
- android:src="@drawable/configure_button"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_toLeftOf="@id/all_apps_button"
- android:layout_marginLeft="@dimen/toolbar_button_spacing"
-
- android:onClick="onClickConfigureButton"
- android:focusable="true"
- android:clickable="true" />
-
<com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
android:src="@drawable/delete_zone_selector"
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 637b6ce..59301b9 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -18,9 +18,13 @@
-->
<resources>
- <style name="Theme" parent="Theme.Base">
+ <style name="Theme" parent="android:Theme.Holo">
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionModeOverlay">true</item>
+
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowShowWallpaper">true</item>
</style>
<style name="WorkspaceIcon.Portrait">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 98de9db..59fdfd3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,8 +118,8 @@
<!-- Title of dialog when user is selecting live folder to add to homescreen -->
<string name="title_select_live_folder">Select folder</string>
- <!-- All applications label for accessibilty (spoken when the button gets focus). -->
- <string name="all_apps_button_label">All applications</string>
+ <!-- All applications label -->
+ <string name="all_apps_button_label">Apps</string>
<!-- Label for button in all applications label to go back home (to the workspace / desktop)
for accessibilty (spoken when the button gets focus). -->
<string name="all_apps_home_button_label">Home</string>
