diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-04-13 14:15:26 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2015-04-13 21:45:39 -0700 |
commit | 94635995e49ee2ab0f3640dd83b2fe680b7bd589 (patch) | |
tree | b8f2fc3d9a272e2271c0a0ae9c3bc57305da22b1 /res | |
parent | fc3bd5c0c2bb0aa8f701d3df4980a76ef6de9801 (diff) | |
download | packages_apps_Settings-94635995e49ee2ab0f3640dd83b2fe680b7bd589.zip packages_apps_Settings-94635995e49ee2ab0f3640dd83b2fe680b7bd589.tar.gz packages_apps_Settings-94635995e49ee2ab0f3640dd83b2fe680b7bd589.tar.bz2 |
Checkpoint of new storage wizards.
Use frameworks/opt/setupwizard/library/ for consistent behavior and
styling on phones and tablets. Implement every step of wizard flow
and connect them together, even though some steps are currently
non-functional. All strings to match UX spec, with some adjustment.
Wizards inherit from helper base class.
New interstitials before unmounting or formatting private storage
to confirm user knows consequences.
Bug: 19993667
Change-Id: I2c774e1718d513805ee8aecfc96d066d4730450c
Diffstat (limited to 'res')
23 files changed, 495 insertions, 94 deletions
diff --git a/res/drawable-hdpi/illustration_horizontal.jpg b/res/drawable-hdpi/illustration_horizontal.jpg Binary files differnew file mode 100644 index 0000000..428b2f4 --- /dev/null +++ b/res/drawable-hdpi/illustration_horizontal.jpg diff --git a/res/drawable-hdpi/illustration_tile.jpg b/res/drawable-hdpi/illustration_tile.jpg Binary files differnew file mode 100644 index 0000000..9931a23 --- /dev/null +++ b/res/drawable-hdpi/illustration_tile.jpg diff --git a/res/drawable-mdpi/illustration_horizontal.jpg b/res/drawable-mdpi/illustration_horizontal.jpg Binary files differnew file mode 100644 index 0000000..52e7993 --- /dev/null +++ b/res/drawable-mdpi/illustration_horizontal.jpg diff --git a/res/drawable-mdpi/illustration_tile.jpg b/res/drawable-mdpi/illustration_tile.jpg Binary files differnew file mode 100644 index 0000000..7923fb4 --- /dev/null +++ b/res/drawable-mdpi/illustration_tile.jpg diff --git a/res/drawable-nodpi/illustration_generic.jpg b/res/drawable-nodpi/illustration_generic.jpg Binary files differnew file mode 100644 index 0000000..f37eaf4 --- /dev/null +++ b/res/drawable-nodpi/illustration_generic.jpg diff --git a/res/drawable-sw600dp-hdpi/illustration_generic.jpg b/res/drawable-sw600dp-hdpi/illustration_generic.jpg Binary files differnew file mode 100644 index 0000000..7aac7f9 --- /dev/null +++ b/res/drawable-sw600dp-hdpi/illustration_generic.jpg diff --git a/res/drawable-sw600dp-mdpi/illustration_generic.jpg b/res/drawable-sw600dp-mdpi/illustration_generic.jpg Binary files differnew file mode 100644 index 0000000..34d0f33 --- /dev/null +++ b/res/drawable-sw600dp-mdpi/illustration_generic.jpg diff --git a/res/drawable-sw600dp-xhdpi/illustration_generic.jpg b/res/drawable-sw600dp-xhdpi/illustration_generic.jpg Binary files differnew file mode 100644 index 0000000..4fe849f --- /dev/null +++ b/res/drawable-sw600dp-xhdpi/illustration_generic.jpg diff --git a/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg b/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg Binary files differnew file mode 100644 index 0000000..48bca97 --- /dev/null +++ b/res/drawable-sw600dp-xxhdpi/illustration_generic.jpg diff --git a/res/drawable-xhdpi/illustration_horizontal.jpg b/res/drawable-xhdpi/illustration_horizontal.jpg Binary files differnew file mode 100644 index 0000000..2733f8e --- /dev/null +++ b/res/drawable-xhdpi/illustration_horizontal.jpg diff --git a/res/drawable-xhdpi/illustration_tile.jpg b/res/drawable-xhdpi/illustration_tile.jpg Binary files differnew file mode 100644 index 0000000..57bccca --- /dev/null +++ b/res/drawable-xhdpi/illustration_tile.jpg diff --git a/res/drawable-xxhdpi/illustration_horizontal.jpg b/res/drawable-xxhdpi/illustration_horizontal.jpg Binary files differnew file mode 100644 index 0000000..aec8d0f --- /dev/null +++ b/res/drawable-xxhdpi/illustration_horizontal.jpg diff --git a/res/drawable-xxhdpi/illustration_tile.jpg b/res/drawable-xxhdpi/illustration_tile.jpg Binary files differnew file mode 100644 index 0000000..2ba33fa --- /dev/null +++ b/res/drawable-xxhdpi/illustration_tile.jpg diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml deleted file mode 100644 index 0360cde..0000000 --- a/res/layout/settings_storage_miscfiles.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2010, 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. -*/ ---> - -<com.android.settings.deviceinfo.FileItemInfoLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:paddingEnd="?android:attr/scrollbarSize" - android:background="?android:attr/selectableItemBackground" - android:gravity="center_vertical" - android:focusable="true"> - - <CheckBox android:id="@+id/misc_checkbox" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentStart="true" - android:paddingStart="16dip" - android:scaleType="fitCenter" - android:layout_centerVertical="true"/> - - <TextView android:id="@+id/misc_filename" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toEndOf="@id/misc_checkbox" - android:maxLines="1" - android:paddingStart="16dip" - android:textAppearance="?android:attr/textAppearanceSmall"/> - - <TextView android:id="@+id/misc_filesize" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toEndOf="@id/misc_checkbox" - android:layout_below="@id/misc_filename" - android:maxLines="1" - android:paddingStart="16dip" - android:textStyle="bold" - android:textAppearance="?android:attr/textAppearanceSmall" /> -</com.android.settings.deviceinfo.FileItemInfoLayout> - diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml deleted file mode 100644 index b712073..0000000 --- a/res/layout/settings_storage_miscfiles_list.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2010, 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. -*/ ---> - -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingEnd="16dip" - android:paddingStart="16dip"> - - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - -</FrameLayout> - diff --git a/res/layout/storage_internal_format.xml b/res/layout/storage_internal_format.xml new file mode 100644 index 0000000..b7a36ca --- /dev/null +++ b/res/layout/storage_internal_format.xml @@ -0,0 +1,51 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + <TextView + android:id="@+id/body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/suw_description_margin_top" + android:paddingBottom="@dimen/suw_description_margin_bottom" + android:paddingStart="@dimen/suw_layout_margin_sides" + android:paddingEnd="@dimen/suw_layout_margin_sides" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + </ScrollView> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp"> + <Button + android:id="@+id/confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/storage_menu_format" /> + </FrameLayout> + +</LinearLayout> diff --git a/res/layout/storage_internal_unmount.xml b/res/layout/storage_internal_unmount.xml new file mode 100644 index 0000000..4779829 --- /dev/null +++ b/res/layout/storage_internal_unmount.xml @@ -0,0 +1,56 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + <TextView + android:id="@+id/body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/suw_description_margin_top" + android:paddingBottom="@dimen/suw_description_margin_bottom" + android:paddingStart="@dimen/suw_layout_margin_sides" + android:paddingEnd="@dimen/suw_layout_margin_sides" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + </ScrollView> + + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp"> + <Button + android:id="@+id/confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/storage_menu_unmount" /> + </FrameLayout> + +</LinearLayout> diff --git a/res/layout/storage_wizard_generic.xml b/res/layout/storage_wizard_generic.xml new file mode 100644 index 0000000..4f0cef9 --- /dev/null +++ b/res/layout/storage_wizard_generic.xml @@ -0,0 +1,54 @@ +<?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. +--> + +<com.android.setupwizardlib.SetupWizardLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + 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"> + + <LinearLayout + style="@style/SuwContentFrame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/storage_wizard_body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + + <TextView + android:id="@+id/storage_wizard_second_body" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + + </LinearLayout> + +</com.android.setupwizardlib.SetupWizardLayout> diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml new file mode 100644 index 0000000..421477c --- /dev/null +++ b/res/layout/storage_wizard_init.xml @@ -0,0 +1,73 @@ +<?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. +--> + +<com.android.setupwizardlib.SetupWizardLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + 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" --> + + <LinearLayout + style="@style/SuwContentFrame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <RadioButton + android:id="@+id/storage_wizard_init_external_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textColor="?android:attr/textColorPrimary" + android:text="@string/storage_wizard_init_external_title" /> + <TextView + android:id="@+id/storage_wizard_init_external_summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorSecondary" + android:text="@string/storage_wizard_init_external_summary" /> + + <RadioButton + android:id="@+id/storage_wizard_init_internal_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textColor="?android:attr/textColorPrimary" + android:text="@string/storage_wizard_init_internal_title" /> + <TextView + android:id="@+id/storage_wizard_init_internal_summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorSecondary" + android:text="@string/storage_wizard_init_internal_summary" /> + + </LinearLayout> + +</com.android.setupwizardlib.SetupWizardLayout> diff --git a/res/layout/storage_wizard_migrate.xml b/res/layout/storage_wizard_migrate.xml new file mode 100644 index 0000000..827a5d2 --- /dev/null +++ b/res/layout/storage_wizard_migrate.xml @@ -0,0 +1,63 @@ +<?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. +--> + +<com.android.setupwizardlib.SetupWizardLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + 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"> + + <LinearLayout + style="@style/SuwContentFrame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/storage_wizard_body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + + <RadioButton + android:id="@+id/storage_wizard_migrate_now" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textColor="?android:attr/textColorPrimary" + android:text="@string/storage_wizard_migrate_now" /> + <RadioButton + android:id="@+id/storage_wizard_migrate_later" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Subhead" + android:textColor="?android:attr/textColorPrimary" + android:text="@string/storage_wizard_migrate_later" /> + + </LinearLayout> + +</com.android.setupwizardlib.SetupWizardLayout> diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml new file mode 100644 index 0000000..52fd203 --- /dev/null +++ b/res/layout/storage_wizard_progress.xml @@ -0,0 +1,59 @@ +<?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. +--> + +<com.android.setupwizardlib.SetupWizardLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + 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"> + + <LinearLayout + style="@style/SuwContentFrame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ProgressBar + android:id="@+id/storage_wizard_progress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:indeterminate="false" + style="?android:attr/progressBarStyleHorizontal" /> + <TextView + android:id="@+id/storage_wizard_progress_summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorSecondary" /> + + <TextView + android:id="@+id/storage_wizard_body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + + </LinearLayout> + +</com.android.setupwizardlib.SetupWizardLayout> diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml new file mode 100644 index 0000000..5cb2e33 --- /dev/null +++ b/res/layout/storage_wizard_ready.xml @@ -0,0 +1,44 @@ +<?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. +--> + +<com.android.setupwizardlib.SetupWizardLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + 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"> + + <LinearLayout + style="@style/SuwContentFrame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/storage_wizard_ready_body" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/suw_description_margin_top" + android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" + android:textAppearance="@android:style/TextAppearance.Material.Body1" + android:textColor="?android:attr/textColorPrimary" /> + + </LinearLayout> + +</com.android.setupwizardlib.SetupWizardLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index a608410..7165f86 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -16,16 +16,12 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Strings for Dialog yes button --> <string name="yes">"Yes"</string> - <!-- Strings for Dialog no button --> <string name="no">"No"</string> - <!-- Strings for Dialog create button --> <string name="create">Create</string> - <!-- Strings for Dialog allow button --> <string name="allow">Allow</string> - <!-- Strings for Dialog deny button --> <string name="deny">Deny</string> @@ -586,15 +582,14 @@ <!-- Button label for generic cancel action [CHAR LIMIT=20] --> <string name="cancel">Cancel</string> - <!-- Button label for generic OK action [CHAR LIMIT=20] --> <string name="okay">OK</string> - <!-- Button label for generic forget action [CHAR LIMIT=20] --> <string name="forget">Forget</string> - <!-- Button label for generic save action [CHAR LIMIT=20] --> <string name="save">Save</string> + <!-- Button label for generic done action [CHAR LIMIT=20] --> + <string name="done">Done</string> <!-- Title of the Settings activity shown within the application itself. --> <string name="settings_label">Settings</string> @@ -2332,6 +2327,99 @@ <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]--> <string name="storage_rename_title">Rename storage</string> + <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]--> + <string name="storage_internal_format_details">After formatting, you can use this <xliff:g id="name" example="SD card">^1</xliff:g> in other devices. +\n\nAll data on this <xliff:g id="name" example="SD card">^1</xliff:g> will be erased. Consider backing up first. +\n\n<b>Back up photos & other media</b> +\nMove your media files to alternative storage on this device, or transfer them to a computer using a USB cable. +\n\n<b>Back up apps</b> +\nAll apps stored on this <xliff:g id="name" example="SD card">^1</xliff:g> will be uninstalled and their data will be erased. To keep these apps, move them to alternative storage on this device.</string> + + <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]--> + <string name="storage_internal_unmount_details"><b>When you eject this <xliff:g id="name" example="SD card">^1</xliff:g>, apps stored on it will stop working, and media files stored on it will not be available until it is reinserted.</b> +\n\nThis <xliff:g id="name" example="SD card">^1</xliff:g> is formatted to work on this device only. It won\'t work on any others.</string> + + <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] --> + <string name="storage_wizard_init_title">Set up your <xliff:g id="name" example="SD card">^1</xliff:g></string> + <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] --> + <string name="storage_wizard_init_external_title">Use as portable storage</string> + <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] --> + <string name="storage_wizard_init_external_summary">For moving photos and other media between devices.</string> + <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] --> + <string name="storage_wizard_init_internal_title">Use as internal storage</string> + <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] --> + <string name="storage_wizard_init_internal_summary">For storing anything on this device only, including apps and photos. Requires formatting that prevents it from working with other devices.</string> + + <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] --> + <string name="storage_wizard_format_confirm_title">Format as internal storage</string> + <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] --> + <string name="storage_wizard_format_confirm_body">This requires the <xliff:g id="name" example="SD card">^1</xliff:g> to be formatted to make it secure. +\n\nAfter formatting, this <xliff:g id="name" example="SD card">^1</xliff:g> will only work in this device. +\n\n<b>Formatting erases all data currently stored on the <xliff:g id="name" example="SD card">^1</xliff:g>.</b> To avoid losing the data, consider backing it up. + </string> + <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] --> + <string name="storage_wizard_format_confirm_next">Erase & format</string> + + <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] --> + <string name="storage_wizard_format_progress_title">Formatting <xliff:g id="name" example="SD card">^1</xliff:g>\u2026</string> + <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] --> + <string name="storage_wizard_format_progress_body">Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g> while it\'s formatting.</string> + + <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] --> + <string name="storage_wizard_migrate_title">Move data to new storage</string> + <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] --> + <string name="storage_wizard_migrate_body">You can move your photos, files, and app data to this new <xliff:g id="name" example="SD card">^1</xliff:g>. +\n\nThe move takes about <xliff:g id="time" example="1 hour">^2</xliff:g> and will free <xliff:g id="size" example="1.2 GB">^3</xliff:g> on internal storage. Some apps won\'t work while it\'s underway. + </string> + <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] --> + <string name="storage_wizard_migrate_now">Move now</string> + <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] --> + <string name="storage_wizard_migrate_later">Move later</string> + + <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] --> + <string name="storage_wizard_migrate_confirm_title">Move data now</string> + <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] --> + <string name="storage_wizard_migrate_confirm_body"><b>The move takes about <xliff:g id="time" example="1 hour">^1</xliff:g>. It will free <xliff:g id="size" example="1.2 GB">^2</xliff:g> of internal storage.</b></string> + <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] --> + <string name="storage_wizard_migrate_confirm_next">Move</string> + + <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] --> + <string name="storage_wizard_migrate_progress_title">Moving data\u2026</string> + + <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] --> + <string name="storage_wizard_migrate_details">During the move: +\n\u2022 Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g>. +\n\u2022 Some apps won\'t work correctly. +\n\u2022 Keep the device charged. + </string> + + <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] --> + <string name="storage_wizard_ready_title"><xliff:g id="name" example="SD card">^1</xliff:g> is ready</string> + <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] --> + <string name="storage_wizard_ready_external_body"> + Your <xliff:g id="name" example="SD card">^1</xliff:g> is all set to use with photos and other media. + </string> + <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] --> + <string name="storage_wizard_ready_internal_body">Your new <xliff:g id="name" example="SD card">^1</xliff:g> is working. +\n\nTo move photos, files, and app data to this device, go to Settings > Storage. + </string> + + <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] --> + <string name="storage_wizard_move_confirm_title">Move <xliff:g id="app" example="Calculator">^1</xliff:g></string> + <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] --> + <string name="storage_wizard_move_confirm_body">Moving <xliff:g id="app" example="Calculator">^1</xliff:g> and its data to <xliff:g id="name" example="SD card">^2</xliff:g> will take only a few moments. You won\'t be able to use the app until the move is complete. +\n\nDon\'t remove the <xliff:g id="name" example="SD card">^2</xliff:g> during the move. + </string> + + <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] --> + <string name="storage_wizard_move_progress_title">Moving <xliff:g id="app" example="Calculator">^1</xliff:g>\u2026</string> + <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] --> + <string name="storage_wizard_move_progress_body">Don\'t remove the <xliff:g id="name" example="SD card">^1</xliff:g> during the move. +\n\nThe <xliff:g id="app" example="Calculator">^2</xliff:g> app on this device won\'t be available until the move is complete. + </string> + <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] --> + <string name="storage_wizard_move_progress_cancel">Cancel move</string> + <!-- Phone info screen, section titles: --> <string name="battery_status_title">Battery status</string> <!-- Phone info screen, section titles: --> |