Gitiles
Code Review Sign In
gerrit.omnirom.org / android_packages_apps_Launcher3 / 74ccebe3c64413105302e4ad9ca4090763b6c2bc^! / .
commit74ccebe3c64413105302e4ad9ca4090763b6c2bc[log] [tgz]
authorDaniel Sandler <dsandler@android.com>Thu Sep 19 15:03:00 2013 -0400
committerDaniel Sandler <dsandler@android.com>Thu Sep 19 15:03:00 2013 -0400
tree691b126ef62787b125403782c5ec7181ec22d52a
parentdbdff6bc7b225255207a46fad8f536b55a18efac [diff]
Updated launcher assets.

 - new All Apps
 - new pagination indicators
   (including one for "add" which is not yet used)

Bug: 10807054
Change-Id: I49c949d635cb1e0b2540e3e8ab44ba62e9ea45f8

diff --git a/res/drawable-hdpi/active_page.png b/res/drawable-hdpi/active_page.png
deleted file mode 100644
index 58aa7f9..0000000
--- a/res/drawable-hdpi/active_page.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-hdpi/ic_allapps.png b/res/drawable-hdpi/ic_allapps.png
index 40d5827..f066d16 100644
--- a/res/drawable-hdpi/ic_allapps.png
+++ b/res/drawable-hdpi/ic_allapps.png
Binary files differ

diff --git a/res/drawable-hdpi/ic_allapps_pressed.png b/res/drawable-hdpi/ic_allapps_pressed.png
index 6d87bbb..1675992 100644
--- a/res/drawable-hdpi/ic_allapps_pressed.png
+++ b/res/drawable-hdpi/ic_allapps_pressed.png
Binary files differ

diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png
new file mode 100644
index 0000000..c77a4f9
--- /dev/null
+++ b/res/drawable-hdpi/ic_pageindicator_add.png
Binary files differ

diff --git a/res/drawable-hdpi/ic_pageindicator_current.png b/res/drawable-hdpi/ic_pageindicator_current.png
new file mode 100644
index 0000000..aac8d40
--- /dev/null
+++ b/res/drawable-hdpi/ic_pageindicator_current.png
Binary files differ

diff --git a/res/drawable-hdpi/ic_pageindicator_default.png b/res/drawable-hdpi/ic_pageindicator_default.png
new file mode 100644
index 0000000..bafd94b
--- /dev/null
+++ b/res/drawable-hdpi/ic_pageindicator_default.png
Binary files differ

diff --git a/res/drawable-hdpi/inactive_page.png b/res/drawable-hdpi/inactive_page.png
deleted file mode 100644
index b70d9f4..0000000
--- a/res/drawable-hdpi/inactive_page.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-mdpi/active_page.png b/res/drawable-mdpi/active_page.png
deleted file mode 100644
index 296a9a6..0000000
--- a/res/drawable-mdpi/active_page.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-mdpi/ic_allapps.png b/res/drawable-mdpi/ic_allapps.png
index a3cce14..6994b7b 100644
--- a/res/drawable-mdpi/ic_allapps.png
+++ b/res/drawable-mdpi/ic_allapps.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_allapps_pressed.png b/res/drawable-mdpi/ic_allapps_pressed.png
index 5c2076f..96581a5 100644
--- a/res/drawable-mdpi/ic_allapps_pressed.png
+++ b/res/drawable-mdpi/ic_allapps_pressed.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_pageindicator_add.png b/res/drawable-mdpi/ic_pageindicator_add.png
new file mode 100644
index 0000000..22420bd
--- /dev/null
+++ b/res/drawable-mdpi/ic_pageindicator_add.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_pageindicator_current.png b/res/drawable-mdpi/ic_pageindicator_current.png
new file mode 100644
index 0000000..ab5f4c8
--- /dev/null
+++ b/res/drawable-mdpi/ic_pageindicator_current.png
Binary files differ

diff --git a/res/drawable-mdpi/ic_pageindicator_default.png b/res/drawable-mdpi/ic_pageindicator_default.png
new file mode 100644
index 0000000..c919ee8
--- /dev/null
+++ b/res/drawable-mdpi/ic_pageindicator_default.png
Binary files differ

diff --git a/res/drawable-mdpi/inactive_page.png b/res/drawable-mdpi/inactive_page.png
deleted file mode 100644
index 2225d25..0000000
--- a/res/drawable-mdpi/inactive_page.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xhdpi/active_page.png b/res/drawable-xhdpi/active_page.png
deleted file mode 100644
index a1cfc35..0000000
--- a/res/drawable-xhdpi/active_page.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xhdpi/ic_allapps.png b/res/drawable-xhdpi/ic_allapps.png
index 961e3f0..549e30f 100644
--- a/res/drawable-xhdpi/ic_allapps.png
+++ b/res/drawable-xhdpi/ic_allapps.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_allapps_pressed.png b/res/drawable-xhdpi/ic_allapps_pressed.png
index 72ff3b9..a703b40 100644
--- a/res/drawable-xhdpi/ic_allapps_pressed.png
+++ b/res/drawable-xhdpi/ic_allapps_pressed.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png
new file mode 100644
index 0000000..9647b8f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pageindicator_add.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_pageindicator_current.png b/res/drawable-xhdpi/ic_pageindicator_current.png
new file mode 100644
index 0000000..aed3d71
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pageindicator_current.png
Binary files differ

diff --git a/res/drawable-xhdpi/ic_pageindicator_default.png b/res/drawable-xhdpi/ic_pageindicator_default.png
new file mode 100644
index 0000000..0887416
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pageindicator_default.png
Binary files differ

diff --git a/res/drawable-xhdpi/inactive_page.png b/res/drawable-xhdpi/inactive_page.png
deleted file mode 100644
index 177b253..0000000
--- a/res/drawable-xhdpi/inactive_page.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_allapps.png b/res/drawable-xxhdpi/ic_allapps.png
index 0cd0f14..500f618 100644
--- a/res/drawable-xxhdpi/ic_allapps.png
+++ b/res/drawable-xxhdpi/ic_allapps.png
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_allapps_pressed.png b/res/drawable-xxhdpi/ic_allapps_pressed.png
index 99494d8..54eb057 100644
--- a/res/drawable-xxhdpi/ic_allapps_pressed.png
+++ b/res/drawable-xxhdpi/ic_allapps_pressed.png
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png
new file mode 100644
index 0000000..591b189
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_pageindicator_add.png
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png
new file mode 100644
index 0000000..08615f3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_pageindicator_current.png
Binary files differ

diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png
new file mode 100644
index 0000000..9d4fbf8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_pageindicator_default.png
Binary files differ

diff --git a/res/layout/page_indicator_marker.xml b/res/layout/page_indicator_marker.xml
index 496f3bd..ac7459d 100644
--- a/res/layout/page_indicator_marker.xml
+++ b/res/layout/page_indicator_marker.xml

@@ -16,20 +16,20 @@
 <com.android.launcher3.PageIndicatorMarker
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="16dp"
+    android:layout_height="16dp"
     android:layout_gravity="center_vertical">
     <ImageView
         android:id="@+id/inactive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/inactive_page"
+        android:src="@drawable/ic_pageindicator_default"
         />
     <ImageView
         android:id="@+id/active"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/active_page"
+        android:src="@drawable/ic_pageindicator_current"
         android:alpha="0"
         />
 </com.android.launcher3.PageIndicatorMarker>