Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev

Browse Source 
* commit 'b1f4cc647f94a24b7918315a21c114f20c644e0b':
  Remove ExternalMediaFormatActivity
This commit is contained in:
Rubin Xu
2015-07-02 16:31:17 +00:00
committed by Android Git Automerger
parent 42a18bdee0 b1f4cc647f
commit 27f13d125f
4 changed files with 0 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
core/java/com/android/internal/app/ExternalMediaFormatActivity.java
View File

@@ -1,108 +0,0 @@
/*
* Copyright (C) 2007 Google Inc.
*
* 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.internal.app;
import com.android.internal.os.storage.ExternalStorageFormatter;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.storage.StorageVolume;
import android.util.Log;
/**
* This activity is shown to the user to confirm formatting of external media.
* It uses the alert dialog style. It will be launched from a notification, or from settings
*/
public class ExternalMediaFormatActivity extends AlertActivity implements DialogInterface.OnClickListener {
private static final int POSITIVE_BUTTON = AlertDialog.BUTTON_POSITIVE;
/** Used to detect when the media state changes, in case we need to call finish() */
private BroadcastReceiver mStorageReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
Log.d("ExternalMediaFormatActivity", "got action " + action);
if (action == Intent.ACTION_MEDIA_REMOVED ||
action == Intent.ACTION_MEDIA_CHECKING ||
action == Intent.ACTION_MEDIA_MOUNTED ||
action == Intent.ACTION_MEDIA_SHARED) {
finish();
}
}
};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.d("ExternalMediaFormatActivity", "onCreate!");
// Set up the "dialog"
final AlertController.AlertParams p = mAlertParams;
p.mTitle = getString(com.android.internal.R.string.extmedia_format_title);
p.mMessage = getString(com.android.internal.R.string.extmedia_format_message);
p.mPositiveButtonText = getString(com.android.internal.R.string.extmedia_format_button_format);
p.mPositiveButtonListener = this;
p.mNegativeButtonText = getString(com.android.internal.R.string.cancel);
p.mNegativeButtonListener = this;
setupAlert();
}
@Override
protected void onResume() {
super.onResume();
IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_MEDIA_REMOVED);
filter.addAction(Intent.ACTION_MEDIA_CHECKING);
filter.addAction(Intent.ACTION_MEDIA_MOUNTED);
filter.addAction(Intent.ACTION_MEDIA_SHARED);
registerReceiver(mStorageReceiver, filter);
}
@Override
protected void onPause() {
super.onPause();
unregisterReceiver(mStorageReceiver);
}
/**
* {@inheritDoc}
*/
public void onClick(DialogInterface dialog, int which) {
if (which == POSITIVE_BUTTON) {
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);
}
// No matter what, finish the activity
finish();
}
}

13
core/res/res/values/strings.xml
View File

@@ -2886,19 +2886,6 @@
<!-- See USB_PREFERENCES. This is the message. -->
<string name="usb_notification_message">Touch for more options.</string>
<!-- External media format dialog strings -->
<!-- This is the label for the activity, and should never be visible to the user. -->
<!-- See EXTMEDIA_FORMAT. EXTMEDIA_FORMAT_DIALOG: After the user selects the notification, a dialog is shown asking if he wants to format the SD card. This is the title. [CHAR LIMIT=20] -->
<string name="extmedia_format_title" product="nosdcard">Format USB storage?</string>
<!-- See EXTMEDIA_FORMAT. EXTMEDIA_FORMAT_DIALOG: After the user selects the notification, a dialog is shown asking if he wants to format the SD card. This is the title. -->
<string name="extmedia_format_title" product="default">Format SD card?</string>
<!-- See EXTMEDIA_FORMAT. This is the message. [CHAR LIMIT=NONE] -->
<string name="extmedia_format_message" product="nosdcard">All files stored in your USB storage will be erased. This action can\'t be reversed!</string>
<!-- See EXTMEDIA_FORMAT. This is the message. -->
<string name="extmedia_format_message" product="default">All data on your card will be lost.</string>
<!-- See EXTMEDIA_FORMAT. This is the button text to format the sd card. -->
<string name="extmedia_format_button_format">Format</string>
<!-- Title of notification shown when ADB is actively connected to the phone. -->
<string name="adb_active_notification_title">USB debugging connected</string>
<!-- Message of notification shown when ADB is actively connected to the phone. -->

3
core/res/res/values/symbols.xml
View File

@@ -625,9 +625,6 @@
<java-symbol type="string" name="eventTypeBirthday" />
<java-symbol type="string" name="eventTypeCustom" />
<java-symbol type="string" name="eventTypeOther" />
<java-symbol type="string" name="extmedia_format_button_format" />
<java-symbol type="string" name="extmedia_format_message" />
<java-symbol type="string" name="extmedia_format_title" />
<java-symbol type="string" name="fileSizeSuffix" />
<java-symbol type="string" name="force_close" />
<java-symbol type="string" name="format_error" />

4
packages/SystemUI/AndroidManifest.xml
View File

@@ -177,10 +177,6 @@
android:label="@*android:string/usb_storage_activity_title"
android:excludeFromRecents="true">
</activity>
<activity android:name="com.android.internal.app.ExternalMediaFormatActivity"
android:theme="@*android:style/Theme.Dialog.Alert"
android:excludeFromRecents="true">
</activity>
<activity android:name=".tuner.TunerActivity"
android:enabled="false"