Merge "Remove unused MediaFormat activity" into mnc-dev (331b9823) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -1649,12 +1649,6 @@
		</intent-filter>
		</activity>

		<activity android:name="MediaFormat" android:label="@string/media_format_title">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		</intent-filter>
		</activity>

		<activity android:name="Settings$DevelopmentSettingsActivity"
		android:label="@string/development_settings_title"
		android:taskAffinity="com.android.settings"

res/layout/media_format_final.xml

deleted100644 → 0

+0 −38

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.
		*/
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		style="@style/info_layout">

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="20sp"
		android:text="@string/media_format_final_desc" />

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

		</LinearLayout>

res/layout/media_format_primary.xml

deleted100644 → 0

+0 −39

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.
		*/
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		style="@style/info_layout">

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textSize="18sp"
		android:text="@string/media_format_desc" />

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

		</LinearLayout>

res/values/strings.xml

+0 −24

Original line number	Diff line number	Diff line
		@@ -2650,30 +2650,6 @@
		<!-- Master clear progress screen text [CHAR LIMIT=75] -->
		<string name="master_clear_progress_text">Please wait...</string>

		<!-- Media Format -->
		<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=25] -->
		<string name="media_format_title" product="nosdcard">Erase USB storage</string>
		<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
		<string name="media_format_title" product="default">Erase SD card</string>
		<!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading [CHAR LIMIT=30] -->
		<string name="media_format_summary" product="nosdcard">Erases all data in USB storage</string>
		<!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
		<string name="media_format_summary" product="default">Erases all data on the SD card</string>
		<!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
		<string name="media_format_desc" product="nosdcard">Erase all USB storage? You will lose <b>all</b> stored data!</string>
		<!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
		<string name="media_format_desc" product="default">Erase the SD card? You will lose <b>all</b> data on the card!</string>
		<!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset [CHAR LIMIT=25] -->
		<string name="media_format_button_text" product="nosdcard">Erase USB storage</string>
		<!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
		<string name="media_format_button_text" product="default">Erase SD card</string>
		<!-- SD card & phone storage settings screen, message on screen after user selects Format media button [CHAR LIMIT=NONE] -->
		<string name="media_format_final_desc" product="nosdcard">Erase the USB storage, deleting all files stored there? You can\u2019t reverse this action!</string>
		<!-- SD card & phone storage settings screen, message on screen after user selects Format media button [CHAR LIMIT=NONE] -->
		<string name="media_format_final_desc" product="default">Erase the SD card, deleting all files stored there? You can\u2019t reverse this action!</string>
		<!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
		<string name="media_format_final_button_text">Erase everything</string>

		<!-- Main settings screen, Call settings title for item to go into the call settings -->
		<string name="call_settings_title">Call settings</string>
		<!-- Main settings screen, Call settings summary for item to go into call settings -->

src/com/android/settings/MediaFormat.java

deleted100644 → 0

+0 −171

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package com.android.settings;

		import android.app.Activity;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.storage.StorageVolume;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.Button;

		import com.android.internal.os.storage.ExternalStorageFormatter;

		/**
		* Confirm and execute a format of the sdcard.
		* Multiple confirmations are required: first, a general "are you sure
		* you want to do this?" prompt, followed by a keyguard pattern trace if the user
		* has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
		* ON THE SD CARD" prompt. If at any time the phone is allowed to go to sleep, is
		* locked, et cetera, then the confirmation sequence is abandoned.
		*/
		public class MediaFormat extends Activity {

		private static final int KEYGUARD_REQUEST = 55;

		private LayoutInflater mInflater;

		private View mInitialView;
		private Button mInitiateButton;

		private View mFinalView;
		private Button mFinalButton;

		/**
		* The user has gone through the multiple confirmation, so now we go ahead
		* and invoke the Mount Service to format the SD card.
		*/
		private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
		public void onClick(View v) {

		if (Utils.isMonkeyRunning()) {
		return;
		}
		Intent intent = new Intent(ExternalStorageFormatter.FORMAT_ONLY);
		intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME);
		// Transfer the storage volume to the new intent
		final StorageVolume storageVolume = getIntent().getParcelableExtra(
		StorageVolume.EXTRA_STORAGE_VOLUME);
		intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, storageVolume);
		startService(intent);
		finish();
		}
		};

		/**
		* Keyguard validation is run using the standard {@link ConfirmLockPattern}
		* component as a subactivity
		*/
		private boolean runKeyguardConfirmation(int request) {
		return new ChooseLockSettingsHelper(this).launchConfirmationActivity(request,
		getText(R.string.media_format_title));
		}

		@Override
		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
		super.onActivityResult(requestCode, resultCode, data);

		if (requestCode != KEYGUARD_REQUEST) {
		return;
		}

		// If the user entered a valid keyguard trace, present the final
		// confirmation prompt; otherwise, go back to the initial state.
		if (resultCode == Activity.RESULT_OK) {
		establishFinalConfirmationState();
		} else if (resultCode == Activity.RESULT_CANCELED) {
		finish();
		} else {
		establishInitialState();
		}
		}

		/**
		* If the user clicks to begin the reset sequence, we next require a
		* keyguard confirmation if the user has currently enabled one. If there
		* is no keyguard available, we simply go to the final confirmation prompt.
		*/
		private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
		public void onClick(View v) {
		if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
		establishFinalConfirmationState();
		}
		}
		};

		/**
		* Configure the UI for the final confirmation interaction
		*/
		private void establishFinalConfirmationState() {
		if (mFinalView == null) {
		mFinalView = mInflater.inflate(R.layout.media_format_final, null);
		mFinalButton =
		(Button) mFinalView.findViewById(R.id.execute_media_format);
		mFinalButton.setOnClickListener(mFinalClickListener);
		}

		setContentView(mFinalView);
		}

		/**
		* In its initial state, the activity presents a button for the user to
		* click in order to initiate a confirmation sequence. This method is
		* called from various other points in the code to reset the activity to
		* this base state.
		*
		* <p>Reinflating views from resources is expensive and prevents us from
		* caching widget pointers, so we use a single-inflate pattern: we lazy-
		* inflate each view, caching all of the widget pointers we'll need at the
		* time, then simply reuse the inflated views directly whenever we need
		* to change contents.
		*/
		private void establishInitialState() {
		if (mInitialView == null) {
		mInitialView = mInflater.inflate(R.layout.media_format_primary, null);
		mInitiateButton =
		(Button) mInitialView.findViewById(R.id.initiate_media_format);
		mInitiateButton.setOnClickListener(mInitiateListener);
		}

		setContentView(mInitialView);
		}

		@Override
		protected void onCreate(Bundle savedState) {
		super.onCreate(savedState);

		mInitialView = null;
		mFinalView = null;
		mInflater = LayoutInflater.from(this);

		establishInitialState();
		}

		/** Abandon all progress through the confirmation sequence by returning
		* to the initial view any time the activity is interrupted (e.g. by
		* idle timeout).
		*/
		@Override
		public void onPause() {
		super.onPause();

		if (!isFinishing()) {
		establishInitialState();
		}
		}
		}