diff options
author | Daichi Hirono <hirono@google.com> | 2015-06-25 04:45:07 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-25 04:45:10 +0000 |
commit | fdc72d907c37da41d0ec6dfd7dabaf26bcda1fca (patch) | |
tree | 89f6380da5060ecf98147ce3bdedba1d6f5cc595 | |
parent | 1c1320a84d22419efb3bf45d970f80b33658edc2 (diff) | |
parent | b7edd7b8521c67ce40047c42563ed0381f750049 (diff) | |
download | packages_apps_Settings-fdc72d907c37da41d0ec6dfd7dabaf26bcda1fca.zip packages_apps_Settings-fdc72d907c37da41d0ec6dfd7dabaf26bcda1fca.tar.gz packages_apps_Settings-fdc72d907c37da41d0ec6dfd7dabaf26bcda1fca.tar.bz2 |
Merge "Update storage wizard's assets." into mnc-dev
50 files changed, 5 insertions, 5 deletions
diff --git a/res/drawable-hdpi/bg_header_horizontal_tile.png b/res/drawable-hdpi/bg_header_horizontal_tile.png Binary files differnew file mode 100644 index 0000000..4270099 --- /dev/null +++ b/res/drawable-hdpi/bg_header_horizontal_tile.png diff --git a/res/drawable-hdpi/bg_internal_storage_header.png b/res/drawable-hdpi/bg_internal_storage_header.png Binary files differindex ccb5951..1c297d9 100644 --- a/res/drawable-hdpi/bg_internal_storage_header.png +++ b/res/drawable-hdpi/bg_internal_storage_header.png diff --git a/res/drawable-hdpi/bg_portable_storage_header.png b/res/drawable-hdpi/bg_portable_storage_header.png Binary files differindex fa640f0..42fe2c1 100644 --- a/res/drawable-hdpi/bg_portable_storage_header.png +++ b/res/drawable-hdpi/bg_portable_storage_header.png diff --git a/res/drawable-hdpi/bg_setup_header.png b/res/drawable-hdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..0d30849 --- /dev/null +++ b/res/drawable-hdpi/bg_setup_header.png diff --git a/res/drawable-hdpi/bg_tile.png b/res/drawable-hdpi/bg_tile.png Binary files differdeleted file mode 100644 index 0680c57..0000000 --- a/res/drawable-hdpi/bg_tile.png +++ /dev/null diff --git a/res/drawable-hdpi/bg_tile_teal.png b/res/drawable-hdpi/bg_tile_teal.png Binary files differnew file mode 100644 index 0000000..26538ec --- /dev/null +++ b/res/drawable-hdpi/bg_tile_teal.png diff --git a/res/drawable-mdpi/bg_header_horizontal_tile.png b/res/drawable-mdpi/bg_header_horizontal_tile.png Binary files differnew file mode 100644 index 0000000..be8512d --- /dev/null +++ b/res/drawable-mdpi/bg_header_horizontal_tile.png diff --git a/res/drawable-mdpi/bg_internal_storage_header.png b/res/drawable-mdpi/bg_internal_storage_header.png Binary files differindex a4f263d..d93c6a2 100644 --- a/res/drawable-mdpi/bg_internal_storage_header.png +++ b/res/drawable-mdpi/bg_internal_storage_header.png diff --git a/res/drawable-mdpi/bg_portable_storage_header.png b/res/drawable-mdpi/bg_portable_storage_header.png Binary files differindex 9b21825..a39df23 100644 --- a/res/drawable-mdpi/bg_portable_storage_header.png +++ b/res/drawable-mdpi/bg_portable_storage_header.png diff --git a/res/drawable-mdpi/bg_setup_header.png b/res/drawable-mdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..f07d3fa --- /dev/null +++ b/res/drawable-mdpi/bg_setup_header.png diff --git a/res/drawable-mdpi/bg_tile.png b/res/drawable-mdpi/bg_tile.png Binary files differdeleted file mode 100644 index bd361f0..0000000 --- a/res/drawable-mdpi/bg_tile.png +++ /dev/null diff --git a/res/drawable-mdpi/bg_tile_teal.png b/res/drawable-mdpi/bg_tile_teal.png Binary files differnew file mode 100644 index 0000000..01abedb --- /dev/null +++ b/res/drawable-mdpi/bg_tile_teal.png diff --git a/res/drawable-sw600dp-hdpi/bg_internal_storage_header.png b/res/drawable-sw600dp-hdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..5102e54 --- /dev/null +++ b/res/drawable-sw600dp-hdpi/bg_internal_storage_header.png diff --git a/res/drawable-sw600dp-hdpi/bg_portable_storage_header.png b/res/drawable-sw600dp-hdpi/bg_portable_storage_header.png Binary files differnew file mode 100644 index 0000000..26fd248 --- /dev/null +++ b/res/drawable-sw600dp-hdpi/bg_portable_storage_header.png diff --git a/res/drawable-sw600dp-hdpi/bg_setup_header.png b/res/drawable-sw600dp-hdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..2178602 --- /dev/null +++ b/res/drawable-sw600dp-hdpi/bg_setup_header.png diff --git a/res/drawable-sw600dp-mdpi/bg_internal_storage_header.png b/res/drawable-sw600dp-mdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..b39c652 --- /dev/null +++ b/res/drawable-sw600dp-mdpi/bg_internal_storage_header.png diff --git a/res/drawable-sw600dp-mdpi/bg_portable_storage_header.png b/res/drawable-sw600dp-mdpi/bg_portable_storage_header.png Binary files differnew file mode 100644 index 0000000..1f5d10b --- /dev/null +++ b/res/drawable-sw600dp-mdpi/bg_portable_storage_header.png diff --git a/res/drawable-sw600dp-mdpi/bg_setup_header.png b/res/drawable-sw600dp-mdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..157b8aa --- /dev/null +++ b/res/drawable-sw600dp-mdpi/bg_setup_header.png diff --git a/res/drawable-sw600dp-xhdpi/bg_internal_storage_header.png b/res/drawable-sw600dp-xhdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..38ea2a3 --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/bg_internal_storage_header.png diff --git a/res/drawable-sw600dp-xhdpi/bg_portable_storage_header.png b/res/drawable-sw600dp-xhdpi/bg_portable_storage_header.png Binary files differnew file mode 100644 index 0000000..169ac25 --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/bg_portable_storage_header.png diff --git a/res/drawable-sw600dp-xhdpi/bg_setup_header.png b/res/drawable-sw600dp-xhdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..a4e1eb3 --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/bg_setup_header.png diff --git a/res/drawable-sw600dp-xxhdpi/bg_internal_storage_header.png b/res/drawable-sw600dp-xxhdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..8920af3 --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi/bg_internal_storage_header.png diff --git a/res/drawable-sw600dp-xxhdpi/bg_portable_storage_header.png b/res/drawable-sw600dp-xxhdpi/bg_portable_storage_header.png Binary files differnew file mode 100644 index 0000000..9190f38 --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi/bg_portable_storage_header.png diff --git a/res/drawable-sw600dp-xxhdpi/bg_setup_header.png b/res/drawable-sw600dp-xxhdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..6fce3df --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi/bg_setup_header.png diff --git a/res/drawable-sw600dp-xxxhdpi/bg_internal_storage_header.png b/res/drawable-sw600dp-xxxhdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..a99ed1c --- /dev/null +++ b/res/drawable-sw600dp-xxxhdpi/bg_internal_storage_header.png diff --git a/res/drawable-sw600dp-xxxhdpi/bg_portable_storage_header.png b/res/drawable-sw600dp-xxxhdpi/bg_portable_storage_header.png Binary files differnew file mode 100644 index 0000000..d979bfb --- /dev/null +++ b/res/drawable-sw600dp-xxxhdpi/bg_portable_storage_header.png diff --git a/res/drawable-sw600dp-xxxhdpi/bg_setup_header.png b/res/drawable-sw600dp-xxxhdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..7276b4e --- /dev/null +++ b/res/drawable-sw600dp-xxxhdpi/bg_setup_header.png diff --git a/res/drawable-xhdpi/bg_header_horizontal_tile.png b/res/drawable-xhdpi/bg_header_horizontal_tile.png Binary files differnew file mode 100644 index 0000000..3b36902 --- /dev/null +++ b/res/drawable-xhdpi/bg_header_horizontal_tile.png diff --git a/res/drawable-xhdpi/bg_internal_storage_header.png b/res/drawable-xhdpi/bg_internal_storage_header.png Binary files differindex 289b31c..f8b64e0 100644 --- a/res/drawable-xhdpi/bg_internal_storage_header.png +++ b/res/drawable-xhdpi/bg_internal_storage_header.png diff --git a/res/drawable-xhdpi/bg_portable_storage_header.png b/res/drawable-xhdpi/bg_portable_storage_header.png Binary files differindex 76154ff..12c432d 100644 --- a/res/drawable-xhdpi/bg_portable_storage_header.png +++ b/res/drawable-xhdpi/bg_portable_storage_header.png diff --git a/res/drawable-xhdpi/bg_setup_header.png b/res/drawable-xhdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..d7c4401 --- /dev/null +++ b/res/drawable-xhdpi/bg_setup_header.png diff --git a/res/drawable-xhdpi/bg_tile.png b/res/drawable-xhdpi/bg_tile.png Binary files differdeleted file mode 100644 index dc5b24c..0000000 --- a/res/drawable-xhdpi/bg_tile.png +++ /dev/null diff --git a/res/drawable-xhdpi/bg_tile_teal.png b/res/drawable-xhdpi/bg_tile_teal.png Binary files differnew file mode 100644 index 0000000..e6f2f06 --- /dev/null +++ b/res/drawable-xhdpi/bg_tile_teal.png diff --git a/res/drawable-xxhdpi/bg_header_horizontal_tile.png b/res/drawable-xxhdpi/bg_header_horizontal_tile.png Binary files differnew file mode 100644 index 0000000..a879fe2 --- /dev/null +++ b/res/drawable-xxhdpi/bg_header_horizontal_tile.png diff --git a/res/drawable-xxhdpi/bg_internal_storage_header.png b/res/drawable-xxhdpi/bg_internal_storage_header.png Binary files differindex ed01721..01fe761 100644 --- a/res/drawable-xxhdpi/bg_internal_storage_header.png +++ b/res/drawable-xxhdpi/bg_internal_storage_header.png diff --git a/res/drawable-xxhdpi/bg_portable_storage_header.png b/res/drawable-xxhdpi/bg_portable_storage_header.png Binary files differindex df6b38e..4bacf7c 100644 --- a/res/drawable-xxhdpi/bg_portable_storage_header.png +++ b/res/drawable-xxhdpi/bg_portable_storage_header.png diff --git a/res/drawable-xxhdpi/bg_setup_header.png b/res/drawable-xxhdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..566cc5f --- /dev/null +++ b/res/drawable-xxhdpi/bg_setup_header.png diff --git a/res/drawable-xxhdpi/bg_tile.png b/res/drawable-xxhdpi/bg_tile.png Binary files differdeleted file mode 100644 index bf28300..0000000 --- a/res/drawable-xxhdpi/bg_tile.png +++ /dev/null diff --git a/res/drawable-xxhdpi/bg_tile_teal.png b/res/drawable-xxhdpi/bg_tile_teal.png Binary files differnew file mode 100644 index 0000000..29d268a --- /dev/null +++ b/res/drawable-xxhdpi/bg_tile_teal.png diff --git a/res/drawable-xxxhdpi/bg_header_horizontal_tile.png b/res/drawable-xxxhdpi/bg_header_horizontal_tile.png Binary files differnew file mode 100644 index 0000000..f19306a --- /dev/null +++ b/res/drawable-xxxhdpi/bg_header_horizontal_tile.png diff --git a/res/drawable-xxxhdpi/bg_internal_storage_header.png b/res/drawable-xxxhdpi/bg_internal_storage_header.png Binary files differindex 26cae96..eb9f268 100644 --- a/res/drawable-xxxhdpi/bg_internal_storage_header.png +++ b/res/drawable-xxxhdpi/bg_internal_storage_header.png diff --git a/res/drawable-xxxhdpi/bg_portable_storage_header.png b/res/drawable-xxxhdpi/bg_portable_storage_header.png Binary files differindex 78003f8..311544a 100644 --- a/res/drawable-xxxhdpi/bg_portable_storage_header.png +++ b/res/drawable-xxxhdpi/bg_portable_storage_header.png diff --git a/res/drawable-xxxhdpi/bg_setup_header.png b/res/drawable-xxxhdpi/bg_setup_header.png Binary files differnew file mode 100644 index 0000000..0df665e --- /dev/null +++ b/res/drawable-xxxhdpi/bg_setup_header.png diff --git a/res/drawable-xxxhdpi/bg_tile.png b/res/drawable-xxxhdpi/bg_tile.png Binary files differdeleted file mode 100644 index 7d22170..0000000 --- a/res/drawable-xxxhdpi/bg_tile.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/bg_tile_teal.png b/res/drawable-xxxhdpi/bg_tile_teal.png Binary files differnew file mode 100644 index 0000000..3d1a97a --- /dev/null +++ b/res/drawable-xxxhdpi/bg_tile_teal.png diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml index 6b5890a..3050c67 100644 --- a/res/layout/storage_wizard_generic.xml +++ b/res/layout/storage_wizard_generic.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/bg_tile"> + app:suwBackgroundTile="@drawable/bg_tile_teal"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml index 6b69dd6..638bfe8 100644 --- a/res/layout/storage_wizard_init.xml +++ b/res/layout/storage_wizard_init.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/bg_tile"> + app:suwBackgroundTile="@drawable/bg_tile_teal"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_migrate.xml b/res/layout/storage_wizard_migrate.xml index d78f4f9..6d041fa 100644 --- a/res/layout/storage_wizard_migrate.xml +++ b/res/layout/storage_wizard_migrate.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/bg_tile"> + app:suwBackgroundTile="@drawable/bg_tile_teal"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml index 114635d..e3b37f8 100644 --- a/res/layout/storage_wizard_progress.xml +++ b/res/layout/storage_wizard_progress.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/bg_tile"> + app:suwBackgroundTile="@drawable/bg_tile_teal"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml index 83ad03c..d53038d 100644 --- a/res/layout/storage_wizard_ready.xml +++ b/res/layout/storage_wizard_ready.xml @@ -20,7 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/bg_tile"> + app:suwBackgroundTile="@drawable/bg_tile_teal"> <LinearLayout style="@style/SuwContentFrame" |