Merge "Shift storage wizards over to Glif theme." (27e7280b) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+9 −1

Original line number	Diff line number	Diff line
		@@ -1862,35 +1862,43 @@

		<!-- Exported for SystemUI to launch into -->
		<activity android:name=".deviceinfo.StorageWizardInit"
		android:theme="@style/SuwThemeMaterial.Light"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
		<activity android:name=".deviceinfo.StorageWizardFormatConfirm"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardFormatProgress"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardMigrate"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardMigrateProgress"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
		<activity android:name=".deviceinfo.StorageWizardReady"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

		<activity android:name=".deviceinfo.StorageWizardMoveConfirm"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="false" />
		<activity android:name=".deviceinfo.StorageWizardMoveProgress"
		android:theme="@style/SetupWizardStorageStyle"
		android:taskAffinity="com.android.settings.storage_wizard"
		android:exported="true"
		android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

res/layout/storage_wizard_footer.xml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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"
		style="@style/SuwGlifButtonBar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<Button
		android:id="@+id/storage_next_button"
		style="@style/SuwGlifButton.Primary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/suw_next_button_label" />

		</LinearLayout>

res/layout/storage_wizard_generic.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,13 +14,13 @@
		limitations under the License.
		-->

		<com.android.setupwizardlib.SetupWizardLayout
		<com.android.setupwizardlib.GlifLayout
		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/bg_tile_teal">
		app:suwFooter="@layout/storage_wizard_footer">

		<LinearLayout
		style="@style/SuwContentFrame"
		@@ -49,4 +49,4 @@

		</LinearLayout>

		</com.android.setupwizardlib.SetupWizardLayout>
		</com.android.setupwizardlib.GlifLayout>

res/layout/storage_wizard_init.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,13 +14,13 @@
		limitations under the License.
		-->

		<com.android.setupwizardlib.SetupWizardLayout
		<com.android.setupwizardlib.GlifLayout
		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/bg_tile_teal">
		app:suwFooter="@layout/storage_wizard_footer">

		<LinearLayout
		style="@style/SuwContentFrame"
		@@ -66,4 +66,4 @@

		</LinearLayout>

		</com.android.setupwizardlib.SetupWizardLayout>
		</com.android.setupwizardlib.GlifLayout>

res/layout/storage_wizard_migrate.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,13 +14,13 @@
		limitations under the License.
		-->

		<com.android.setupwizardlib.SetupWizardLayout
		<com.android.setupwizardlib.GlifLayout
		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/bg_tile_teal">
		app:suwFooter="@layout/storage_wizard_footer">

		<LinearLayout
		style="@style/SuwContentFrame"
		@@ -58,4 +58,4 @@

		</LinearLayout>

		</com.android.setupwizardlib.SetupWizardLayout>
		</com.android.setupwizardlib.GlifLayout>