Fragmentize "Factory reset" setting screen. (b14e1e04) · Commits · e / os / android_packages_apps_Settings

proguard.flags

+3 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,6 @@
		-keep class com.android.settings.bluetooth.*
		-keep class com.android.settings.applications.*
		-keep class com.android.settings.inputmethod.*
		-keep class com.android.settings.MasterClear
		-keep class com.android.settings.MasterClearConfirm

res/layout/master_clear_primary.xml→res/layout/master_clear.xml

+27 −23

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright (C) 2008 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.
		*/
		<!-- Copyright (C) 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.
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		style="@style/info_layout">

		<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="fill_parent"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_marginLeft="12dp"
		android:layout_marginRight="12dp"
		android:layout_marginTop="12dp"
		android:layout_weight="1">
		<LinearLayout android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -42,13 +44,14 @@
		<CheckBox android:id="@+id/erase_external"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:layout_gravity="center_vertical"
		android:paddingRight="8dp"
		android:focusable="false"
		android:clickable="false"
		android:duplicateParentState="true" />
		<LinearLayout android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:orientation="vertical">
		<TextView
		android:layout_width="wrap_content"
		@@ -70,7 +73,8 @@
		android:id="@+id/initiate_master_clear"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="20dip"
		android:layout_width="150dip"
		android:layout_marginBottom="12dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/master_clear_button_text"
		android:gravity="center" />

res/layout/master_clear_final.xml→res/layout/master_clear_confirm.xml

+39 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright (C) 2008 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.
		*/
		-->
		<!-- Copyright (C) 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

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		style="@style/info_layout">
		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"
		>

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="12dp"
		android:layout_marginRight="12dp"
		android:layout_marginTop="12dp"
		android:textSize="20sp"
		android:text="@string/master_clear_final_desc" />

		<Button android:id="@+id/execute_master_clear"
		android:layout_gravity="center_horizontal"
		android:layout_marginTop="40dip"
		android:layout_width="150dip"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/master_clear_final_button_text"
		android:gravity="center" />

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1608,6 +1608,8 @@
		<string name="master_clear_gesture_explanation">You must draw your unlock pattern to confirm a factory data reset.</string>
		<!-- Master clear failed message -->
		<string name="master_clear_failed">No reset was performed because the System Clear service is not available.</string>
		<!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
		<string name="master_clear_confirm_title">Confirm reset</string>

		<!-- Media Format -->
		<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=25] -->

res/xml/privacy_settings.xml

+5 −9

Original line number	Diff line number	Diff line
		@@ -33,15 +33,11 @@
		</PreferenceCategory>

		<PreferenceCategory
		android:title="@string/personal_data_section_title">
		android:title="@string/personal_data_section_title"/>
		<!-- Factory reset -->
		<PreferenceScreen
		android:title="@string/master_clear_title"
		android:summary="@string/master_clear_summary">
		<intent android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings"
		android:targetClass="com.android.settings.MasterClear" />
		</PreferenceScreen>
		</PreferenceCategory>
		android:summary="@string/master_clear_summary"
		android:fragment="com.android.settings.MasterClear" />

		</PreferenceScreen>