OSDN Git Service

Updated launcher assets.
authorDaniel Sandler <dsandler@android.com>
Thu, 19 Sep 2013 19:03:00 +0000 (15:03 -0400)
committerDaniel Sandler <dsandler@android.com>
Thu, 19 Sep 2013 19:03:00 +0000 (15:03 -0400)
 - new All Apps
 - new pagination indicators
   (including one for "add" which is not yet used)

Bug: 10807054
Change-Id: I49c949d635cb1e0b2540e3e8ab44ba62e9ea45f8

27 files changed:
res/drawable-hdpi/active_page.png [deleted file]
res/drawable-hdpi/ic_allapps.png
res/drawable-hdpi/ic_allapps_pressed.png
res/drawable-hdpi/ic_pageindicator_add.png [new file with mode: 0644]
res/drawable-hdpi/ic_pageindicator_current.png [new file with mode: 0644]
res/drawable-hdpi/ic_pageindicator_default.png [new file with mode: 0644]
res/drawable-hdpi/inactive_page.png [deleted file]
res/drawable-mdpi/active_page.png [deleted file]
res/drawable-mdpi/ic_allapps.png
res/drawable-mdpi/ic_allapps_pressed.png
res/drawable-mdpi/ic_pageindicator_add.png [new file with mode: 0644]
res/drawable-mdpi/ic_pageindicator_current.png [new file with mode: 0644]
res/drawable-mdpi/ic_pageindicator_default.png [new file with mode: 0644]
res/drawable-mdpi/inactive_page.png [deleted file]
res/drawable-xhdpi/active_page.png [deleted file]
res/drawable-xhdpi/ic_allapps.png
res/drawable-xhdpi/ic_allapps_pressed.png
res/drawable-xhdpi/ic_pageindicator_add.png [new file with mode: 0644]
res/drawable-xhdpi/ic_pageindicator_current.png [new file with mode: 0644]
res/drawable-xhdpi/ic_pageindicator_default.png [new file with mode: 0644]
res/drawable-xhdpi/inactive_page.png [deleted file]
res/drawable-xxhdpi/ic_allapps.png
res/drawable-xxhdpi/ic_allapps_pressed.png
res/drawable-xxhdpi/ic_pageindicator_add.png [new file with mode: 0644]
res/drawable-xxhdpi/ic_pageindicator_current.png [new file with mode: 0644]
res/drawable-xxhdpi/ic_pageindicator_default.png [new file with mode: 0644]
res/layout/page_indicator_marker.xml

diff --git a/res/drawable-hdpi/active_page.png b/res/drawable-hdpi/active_page.png
deleted file mode 100644 (file)
index 58aa7f9..0000000
Binary files a/res/drawable-hdpi/active_page.png and /dev/null differ
index 40d5827..f066d16 100644 (file)
Binary files a/res/drawable-hdpi/ic_allapps.png and b/res/drawable-hdpi/ic_allapps.png differ
index 6d87bbb..1675992 100644 (file)
Binary files a/res/drawable-hdpi/ic_allapps_pressed.png and b/res/drawable-hdpi/ic_allapps_pressed.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png
new file mode 100644 (file)
index 0000000..c77a4f9
Binary files /dev/null and b/res/drawable-hdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_current.png b/res/drawable-hdpi/ic_pageindicator_current.png
new file mode 100644 (file)
index 0000000..aac8d40
Binary files /dev/null and b/res/drawable-hdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_default.png b/res/drawable-hdpi/ic_pageindicator_default.png
new file mode 100644 (file)
index 0000000..bafd94b
Binary files /dev/null and b/res/drawable-hdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-hdpi/inactive_page.png b/res/drawable-hdpi/inactive_page.png
deleted file mode 100644 (file)
index b70d9f4..0000000
Binary files a/res/drawable-hdpi/inactive_page.png and /dev/null differ
diff --git a/res/drawable-mdpi/active_page.png b/res/drawable-mdpi/active_page.png
deleted file mode 100644 (file)
index 296a9a6..0000000
Binary files a/res/drawable-mdpi/active_page.png and /dev/null differ
index a3cce14..6994b7b 100644 (file)
Binary files a/res/drawable-mdpi/ic_allapps.png and b/res/drawable-mdpi/ic_allapps.png differ
index 5c2076f..96581a5 100644 (file)
Binary files a/res/drawable-mdpi/ic_allapps_pressed.png and b/res/drawable-mdpi/ic_allapps_pressed.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_add.png b/res/drawable-mdpi/ic_pageindicator_add.png
new file mode 100644 (file)
index 0000000..22420bd
Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_current.png b/res/drawable-mdpi/ic_pageindicator_current.png
new file mode 100644 (file)
index 0000000..ab5f4c8
Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_default.png b/res/drawable-mdpi/ic_pageindicator_default.png
new file mode 100644 (file)
index 0000000..c919ee8
Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-mdpi/inactive_page.png b/res/drawable-mdpi/inactive_page.png
deleted file mode 100644 (file)
index 2225d25..0000000
Binary files a/res/drawable-mdpi/inactive_page.png and /dev/null differ
diff --git a/res/drawable-xhdpi/active_page.png b/res/drawable-xhdpi/active_page.png
deleted file mode 100644 (file)
index a1cfc35..0000000
Binary files a/res/drawable-xhdpi/active_page.png and /dev/null differ
index 961e3f0..549e30f 100644 (file)
Binary files a/res/drawable-xhdpi/ic_allapps.png and b/res/drawable-xhdpi/ic_allapps.png differ
index 72ff3b9..a703b40 100644 (file)
Binary files a/res/drawable-xhdpi/ic_allapps_pressed.png and b/res/drawable-xhdpi/ic_allapps_pressed.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png
new file mode 100644 (file)
index 0000000..9647b8f
Binary files /dev/null and b/res/drawable-xhdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_current.png b/res/drawable-xhdpi/ic_pageindicator_current.png
new file mode 100644 (file)
index 0000000..aed3d71
Binary files /dev/null and b/res/drawable-xhdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_default.png b/res/drawable-xhdpi/ic_pageindicator_default.png
new file mode 100644 (file)
index 0000000..0887416
Binary files /dev/null and b/res/drawable-xhdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-xhdpi/inactive_page.png b/res/drawable-xhdpi/inactive_page.png
deleted file mode 100644 (file)
index 177b253..0000000
Binary files a/res/drawable-xhdpi/inactive_page.png and /dev/null differ
index 0cd0f14..500f618 100644 (file)
Binary files a/res/drawable-xxhdpi/ic_allapps.png and b/res/drawable-xxhdpi/ic_allapps.png differ
index 99494d8..54eb057 100644 (file)
Binary files a/res/drawable-xxhdpi/ic_allapps_pressed.png and b/res/drawable-xxhdpi/ic_allapps_pressed.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png
new file mode 100644 (file)
index 0000000..591b189
Binary files /dev/null and b/res/drawable-xxhdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png
new file mode 100644 (file)
index 0000000..08615f3
Binary files /dev/null and b/res/drawable-xxhdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png
new file mode 100644 (file)
index 0000000..9d4fbf8
Binary files /dev/null and b/res/drawable-xxhdpi/ic_pageindicator_default.png differ
index 496f3bd..ac7459d 100644 (file)
 <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>