summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-06-30 17:39:37 -0700
committerWinson Chung <winsonc@google.com>2011-06-30 17:43:39 -0700
commit3ac74c55cf8baef29db80e8c67ab4ab033b04417 (patch)
treec97c29872343f8de147e3190e954067dcbfe172b /res
parent04dc2bc6139ff414e49fc423d28edbd5801cdc03 (diff)
downloadandroid_packages_apps_Trebuchet-3ac74c55cf8baef29db80e8c67ab4ab033b04417.tar.gz
android_packages_apps_Trebuchet-3ac74c55cf8baef29db80e8c67ab4ab033b04417.tar.bz2
android_packages_apps_Trebuchet-3ac74c55cf8baef29db80e8c67ab4ab033b04417.zip
Tweaking the scroll indicators with new assets and sizing.
- Showing the scroll indicators when changing between workspace/apps customize Change-Id: I791c09b76deb00108c466f08ae3c29b19d77c4d8
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/hotseat_scrubber_holo.9.pngbin0 -> 184 bytes
-rw-r--r--res/drawable-hdpi/hotseat_track_holo.9.pngbin0 -> 174 bytes
-rw-r--r--res/drawable-hdpi/paged_view_indicator.9.pngbin358 -> 0 bytes
-rw-r--r--res/drawable-mdpi/hotseat_scrubber_holo.9.pngbin0 -> 173 bytes
-rw-r--r--res/drawable-mdpi/hotseat_track_holo.9.pngbin0 -> 157 bytes
-rw-r--r--res/layout-land/launcher.xml10
-rw-r--r--res/layout-port/launcher.xml13
-rw-r--r--res/layout/apps_customize_pane.xml9
8 files changed, 28 insertions, 4 deletions
diff --git a/res/drawable-hdpi/hotseat_scrubber_holo.9.png b/res/drawable-hdpi/hotseat_scrubber_holo.9.png
new file mode 100644
index 000000000..78b540d47
--- /dev/null
+++ b/res/drawable-hdpi/hotseat_scrubber_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png
new file mode 100644
index 000000000..ca495ffac
--- /dev/null
+++ b/res/drawable-hdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/paged_view_indicator.9.png b/res/drawable-hdpi/paged_view_indicator.9.png
deleted file mode 100644
index 9fd357a88..000000000
--- a/res/drawable-hdpi/paged_view_indicator.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_scrubber_holo.9.png b/res/drawable-mdpi/hotseat_scrubber_holo.9.png
new file mode 100644
index 000000000..8b7e109bd
--- /dev/null
+++ b/res/drawable-mdpi/hotseat_scrubber_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png
new file mode 100644
index 000000000..a542cb7b9
--- /dev/null
+++ b/res/drawable-mdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 3c5e0df36..d2f52c839 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -39,6 +39,14 @@
<include android:id="@+id/cell4" layout="@layout/workspace_screen" />
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
+
+ <ImageView
+ android:id="@+id/paged_view_indicator_track"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:scaleType="fitXY"
+ android:src="@drawable/hotseat_track_holo" />
<ImageView
android:id="@+id/paged_view_indicator"
android:layout_width="wrap_content"
@@ -47,7 +55,7 @@
android:visibility="gone"
android:alpha="0"
android:scaleType="fitXY"
- android:src="@drawable/paged_view_indicator" />
+ android:src="@drawable/hotseat_scrubber_holo" />
<include layout="@layout/qsb_bar"
android:id="@+id/qsb_bar"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index d2b9275ef..acb3b474b 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -37,16 +37,25 @@
<include android:id="@+id/cell4" layout="@layout/workspace_screen" />
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
+
+ <ImageView
+ android:id="@+id/paged_view_indicator_track"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:layout_marginBottom="@dimen/button_bar_height"
+ android:scaleType="fitXY"
+ android:src="@drawable/hotseat_track_holo" />
<ImageView
android:id="@+id/paged_view_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
+ android:layout_marginBottom="@dimen/button_bar_height"
android:visibility="gone"
- android:paddingBottom="@dimen/button_bar_height"
android:alpha="0"
android:scaleType="fitXY"
- android:src="@drawable/paged_view_indicator" />
+ android:src="@drawable/hotseat_scrubber_holo" />
<include layout="@layout/qsb_bar"
android:id="@+id/qsb_bar"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index b45515328..ecb10ec34 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -76,6 +76,13 @@
launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y"
launcher:maxGap="@dimen/workspace_max_gap" />
<ImageView
+ android:id="@+id/paged_view_indicator_track"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:scaleType="fitXY"
+ android:src="@drawable/hotseat_track_holo" />
+ <ImageView
android:id="@+id/paged_view_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -83,7 +90,7 @@
android:visibility="gone"
android:alpha="0"
android:scaleType="fitXY"
- android:src="@drawable/paged_view_indicator" />
+ android:src="@drawable/hotseat_scrubber_holo" />
</FrameLayout>
</LinearLayout>
</com.android.launcher2.AppsCustomizeTabHost>