diff options
Diffstat (limited to 'res')
26 files changed, 107 insertions, 18 deletions
diff --git a/res/color/storage_wizard_button.xml b/res/color/storage_wizard_button.xml new file mode 100644 index 0000000..38c7d52 --- /dev/null +++ b/res/color/storage_wizard_button.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:alpha="?android:attr/disabledAlpha" + android:color="?android:attr/colorAccent" /> + <item android:color="?android:attr/colorAccent" /> +</selector> diff --git a/res/color/storage_wizard_button_red.xml b/res/color/storage_wizard_button_red.xml new file mode 100644 index 0000000..9e9a908 --- /dev/null +++ b/res/color/storage_wizard_button_red.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:alpha="?android:attr/disabledAlpha" + android:color="#fff4511e" /> + <item android:color="#fff4511e" /> +</selector> diff --git a/res/drawable-hdpi/bg_internal_storage_header.png b/res/drawable-hdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..ccb5951 --- /dev/null +++ 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 differnew file mode 100644 index 0000000..fa640f0 --- /dev/null +++ b/res/drawable-hdpi/bg_portable_storage_header.png diff --git a/res/drawable-hdpi/bg_tile.png b/res/drawable-hdpi/bg_tile.png Binary files differnew file mode 100644 index 0000000..0680c57 --- /dev/null +++ b/res/drawable-hdpi/bg_tile.png diff --git a/res/drawable-mdpi/bg_internal_storage_header.png b/res/drawable-mdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..a4f263d --- /dev/null +++ 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 differnew file mode 100644 index 0000000..9b21825 --- /dev/null +++ b/res/drawable-mdpi/bg_portable_storage_header.png diff --git a/res/drawable-mdpi/bg_tile.png b/res/drawable-mdpi/bg_tile.png Binary files differnew file mode 100644 index 0000000..bd361f0 --- /dev/null +++ b/res/drawable-mdpi/bg_tile.png diff --git a/res/drawable-xhdpi/bg_internal_storage_header.png b/res/drawable-xhdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..289b31c --- /dev/null +++ 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 differnew file mode 100644 index 0000000..76154ff --- /dev/null +++ b/res/drawable-xhdpi/bg_portable_storage_header.png diff --git a/res/drawable-xhdpi/bg_tile.png b/res/drawable-xhdpi/bg_tile.png Binary files differnew file mode 100644 index 0000000..dc5b24c --- /dev/null +++ b/res/drawable-xhdpi/bg_tile.png diff --git a/res/drawable-xxhdpi/bg_internal_storage_header.png b/res/drawable-xxhdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..ed01721 --- /dev/null +++ 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 differnew file mode 100644 index 0000000..df6b38e --- /dev/null +++ b/res/drawable-xxhdpi/bg_portable_storage_header.png diff --git a/res/drawable-xxhdpi/bg_tile.png b/res/drawable-xxhdpi/bg_tile.png Binary files differnew file mode 100644 index 0000000..bf28300 --- /dev/null +++ b/res/drawable-xxhdpi/bg_tile.png diff --git a/res/drawable-xxxhdpi/bg_internal_storage_header.png b/res/drawable-xxxhdpi/bg_internal_storage_header.png Binary files differnew file mode 100644 index 0000000..26cae96 --- /dev/null +++ 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 differnew file mode 100644 index 0000000..78003f8 --- /dev/null +++ b/res/drawable-xxxhdpi/bg_portable_storage_header.png diff --git a/res/drawable-xxxhdpi/bg_tile.png b/res/drawable-xxxhdpi/bg_tile.png Binary files differnew file mode 100644 index 0000000..7d22170 --- /dev/null +++ b/res/drawable-xxxhdpi/bg_tile.png diff --git a/res/layout/preference_storage_action.xml b/res/layout/preference_storage_action.xml index 19d7763..5a37871 100644 --- a/res/layout/preference_storage_action.xml +++ b/res/layout/preference_storage_action.xml @@ -30,6 +30,7 @@ android:layout_gravity="center" android:gravity="center" android:src="@drawable/ic_eject_24dp" + android:tint="?android:attr/textColorSecondary" android:background="?android:attr/selectableItemBackground" /> </LinearLayout> diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml index cd63671..96a0cee 100644 --- a/res/layout/storage_summary.xml +++ b/res/layout/storage_summary.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:textAlignment="viewStart" android:textAppearance="@android:style/TextAppearance.Material.Body1" - android:textColor="#8a000000" + android:textColor="?android:attr/textColorSecondaryNoDisable" android:maxLines="10" /> <ProgressBar diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml index 4f0cef9..6b5890a 100644 --- a/res/layout/storage_wizard_generic.xml +++ b/res/layout/storage_wizard_generic.xml @@ -20,9 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/illustration_tile" - app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal" - app:suwIllustrationImage="@drawable/illustration_generic"> + app:suwBackgroundTile="@drawable/bg_tile"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml index 421477c..6b69dd6 100644 --- a/res/layout/storage_wizard_init.xml +++ b/res/layout/storage_wizard_init.xml @@ -20,11 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/illustration_tile" - app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal" - app:suwIllustrationImage="@drawable/illustration_generic"> - - <!-- android:layout="@layout/suw_template_short" --> + app:suwBackgroundTile="@drawable/bg_tile"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_migrate.xml b/res/layout/storage_wizard_migrate.xml index 827a5d2..d78f4f9 100644 --- a/res/layout/storage_wizard_migrate.xml +++ b/res/layout/storage_wizard_migrate.xml @@ -20,9 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/illustration_tile" - app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal" - app:suwIllustrationImage="@drawable/illustration_generic"> + app:suwBackgroundTile="@drawable/bg_tile"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_navigation.xml b/res/layout/storage_wizard_navigation.xml new file mode 100644 index 0000000..94f9baf --- /dev/null +++ b/res/layout/storage_wizard_navigation.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/suw_layout_navigation_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <Button + android:id="@+id/suw_navbar_back" + android:layout_width="0dp" + android:layout_height="0dp" + android:visibility="gone" /> + + <View + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" /> + + <Button + android:id="@+id/suw_navbar_more" + android:layout_width="0dp" + android:layout_height="0dp" + android:visibility="gone" /> + + <Button + android:id="@+id/suw_navbar_next" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:layout_marginEnd="16dp" + android:text="@string/wizard_next" + android:textColor="@android:color/white" + android:backgroundTint="@color/storage_wizard_button" /> + +</LinearLayout> diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml index 52fd203..114635d 100644 --- a/res/layout/storage_wizard_progress.xml +++ b/res/layout/storage_wizard_progress.xml @@ -20,9 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/illustration_tile" - app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal" - app:suwIllustrationImage="@drawable/illustration_generic"> + app:suwBackgroundTile="@drawable/bg_tile"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml index 5cb2e33..83ad03c 100644 --- a/res/layout/storage_wizard_ready.xml +++ b/res/layout/storage_wizard_ready.xml @@ -20,9 +20,7 @@ android:id="@+id/setup_wizard_layout" android:layout_width="match_parent" android:layout_height="match_parent" - app:suwBackgroundTile="@drawable/illustration_tile" - app:suwIllustrationHorizontalTile="@drawable/illustration_horizontal" - app:suwIllustrationImage="@drawable/illustration_generic"> + app:suwBackgroundTile="@drawable/bg_tile"> <LinearLayout style="@style/SuwContentFrame" diff --git a/res/values/styles.xml b/res/values/styles.xml index d24337f..ef1dbc8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -343,4 +343,8 @@ <item name="android:textSize">16sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> + + <style name="SetupWizardStorageStyle" parent="@style/SuwThemeMaterial.Light"> + <item name="android:colorAccent">#ff009688</item> + </style> </resources> |
