Add new buttons to clear data, move apps to/from sdcard

rearrange layouts

res/layout/installed_app_details.xml

@@ -72,7 +72,10 @@
                 android:paddingRight="6dip"
                 android:scaleType="fitCenter" />
         </RelativeLayout>
-
+        <!-- Force stop and uninstall buttons -->
+        <include
+            layout="@layout/two_buttons_panel"
+            android:id="@+id/control_buttons_panel"/>
 
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
@@ -193,37 +196,11 @@
                     android:maxLines="1" />
 
             </LinearLayout>
-            <!-- Manage space, Clear data/Uninstall buttons  -->
+            <!-- Clear data and install location buttons  -->
-            <LinearLayout
+            <include
-                android:layout_width="match_parent"
+                layout="@layout/two_buttons_panel"
-                android:layout_height="wrap_content"
+                android:id="@+id/data_buttons_panel"/>
-                android:gravity="bottom"
-                android:orientation="horizontal">
-                <Button
-                    android:id="@+id/manage_space_button"
-                    android:text="@string/manage_space_text"
-                    android:visibility="invisible"
-                    android:layout_width="150dip"
-                    android:paddingLeft="6dip"
-                    android:layout_gravity="left"
-                    android:layout_weight="0.4"
-                    android:layout_height="wrap_content"/>
-                <!-- Spacer -->
-                <View
-                    android:id="@+id/buttons_spacer_left"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2"
-                    android:visibility="gone" />
 
-                <Button
-                    android:id="@+id/uninstall_button"
-                    android:layout_width="150dip"
-                    android:paddingRight="6dip"
-                    android:layout_gravity="right"
-                    android:layout_weight="0.4"
-                    android:layout_height="wrap_content"/>
-            </LinearLayout>
         </LinearLayout>
 
         <!-- Clear cache section -->
@@ -307,25 +284,6 @@
                 android:layout_height="wrap_content" />
         </RelativeLayout>
 
-        <!-- Other controls section -->
-        <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
-            android:text="@string/controls_label" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <Button android:id="@+id/force_stop_button"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:layout_centerHorizontal="true"
-                android:paddingTop="6dip"
-                android:layout_width="150dip"
-                android:text="@string/force_stop"
-                android:layout_height="wrap_content" />
-        </RelativeLayout>
-
         <!-- Permissions section -->
         <LinearLayout
             android:id="@+id/permissions_section"

res/layout/two_buttons_panel.xml

@@ -0,0 +1,52 @@
+<?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.
+-->
+
+<!--
+  Defines a panel with two buttons and a spacer in between.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:paddingTop="4dip"
+        android:paddingLeft="2dip"
+        android:paddingRight="2dip"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/left_button"
+            android:layout_width="150dip"
+            android:paddingLeft="6dip"
+            android:layout_gravity="left"
+            android:layout_weight="0.4"
+            android:layout_height="wrap_content"/>
+        <!-- Spacer -->
+        <View
+            android:id="@+id/buttons_spacer_left"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_weight="0.2" />
+        <Button
+            android:id="@+id/right_button"
+            android:layout_width="150dip"
+            android:paddingRight="6dip"
+            android:layout_gravity="right"
+            android:text="@string/cancel"
+            android:layout_weight="0.4"
+            android:layout_height="wrap_content"/>
+</LinearLayout>

res/values/strings.xml

@@ -1548,6 +1548,16 @@ found in the list of installed applications.</string>
     <string name="empty_list_msg">You do not have any third-party applications installed.</string>
     <!-- Manage applications, version string displayed in app snippet -->
     <string name="version_text">version <xliff:g id="version_num">%1$s</xliff:g></string>
+    <!-- Manage applications, text for Move button -->
+    <string name="move_app">Move</string>
+    <!-- Manage applications, text for Move button to move app to internal storage -->
+    <string name="move_app_to_internal">Move to flash</string>
+    <!-- Manage applications, text for Move button  to move app to sdcard -->
+    <string name="move_app_to_sdcard">Move to sdcard</string>
+    <!-- Manage applications, title for dialog when killing persistent apps-->
+    <string name="force_stop_dlg_title">Force Stop</string>
+    <!-- Manage applications, text for dialog when killing persistent apps-->
+    <string name="force_stop_dlg_text">This application will be restarted right way. Are you sure you want to force stop?</string>
 
     <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
     <string name="runningservices_settings_title">Running services</string>

src/com/android/settings/InstalledAppDetails.java

@@ -23,6 +23,7 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.ActivityManager.RunningAppProcessInfo;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -62,11 +63,12 @@ import android.widget.TextView;
  * For non-system applications, there is no option to clear data. Instead there is an option to
  * uninstall the application.
  */
-public class InstalledAppDetails extends Activity implements View.OnClickListener, DialogInterface.OnClickListener  {
+public class InstalledAppDetails extends Activity implements View.OnClickListener {
     private static final String TAG="InstalledAppDetails";
     private static final int _UNKNOWN_APP=R.string.unknown;
     private ApplicationInfo mAppInfo;
-    private Button mAppButton;
+    private Button mUninstallButton;
+    private boolean mUpdatedSysApp = false;
     private Button mActivitiesButton;
     private boolean localLOGV = false;
     private TextView mAppVersion;
@@ -76,14 +78,14 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     private PkgSizeObserver mSizeObserver;
     private ClearUserDataObserver mClearDataObserver;
     // Views related to cache info
-    private View mCachePanel;
     private TextView mCacheSize;
     private Button mClearCacheButton;
     private ClearCacheObserver mClearCacheObserver;
     private Button mForceStopButton;
+    private Button mClearDataButton;
+    private Button mMoveAppButton;
     
     PackageStats mSizeInfo;
-    private Button mManageSpaceButton;
     private PackageManager mPm;
     
     //internal constants used in Handler
@@ -101,7 +103,6 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     // Resource strings
     private CharSequence mInvalidSizeStr;
     private CharSequence mComputingStr;
-    private CharSequence mAppButtonText;
     
     // Dialog identifiers used in showDialog
     private static final int DLG_BASE = 0;
@@ -109,15 +110,7 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     private static final int DLG_FACTORY_RESET = DLG_BASE + 2;
     private static final int DLG_APP_NOT_FOUND = DLG_BASE + 3;
     private static final int DLG_CANNOT_CLEAR_DATA = DLG_BASE + 4;
-    
+    private static final int DLG_FORCE_STOP = DLG_BASE + 5;
-    // Possible btn states
-    private enum AppButtonStates {
-        CLEAR_DATA,
-        UNINSTALL,
-        FACTORY_RESET,
-        NONE
-    } 
-    private AppButtonStates mAppButtonState;
     
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -147,7 +140,6 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     }
     
     class PkgSizeObserver extends IPackageStatsObserver.Stub {
-        public int idx;
         public void onGetStatsCompleted(PackageStats pStats, boolean succeeded) {
              Message msg = mHandler.obtainMessage(GET_PKG_SIZE);
              Bundle data = new Bundle();
@@ -173,6 +165,69 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         return Formatter.formatFileSize(this, size);
     }
     
+    private void initDataButtons() {
+        if (mAppInfo.manageSpaceActivityName != null) {
+            mClearDataButton.setText(R.string.manage_space_text);
+        } else {
+            mClearDataButton.setText(R.string.clear_user_data_text);
+        }
+        mClearDataButton.setOnClickListener(this);
+        String pkgName = mAppInfo.packageName;
+        boolean dataOnly = false;
+        ApplicationInfo info1 = null;
+        ApplicationInfo info2 = null;
+
+        try {
+            info1 = mPm.getApplicationInfo(pkgName, 0);
+        } catch (NameNotFoundException e) {
+        }
+        dataOnly = (info1 == null) && (mAppInfo != null);
+        if (dataOnly) {
+            mMoveAppButton.setText(R.string.move_app);
+        } else if ((mAppInfo.flags & ApplicationInfo.FLAG_ON_SDCARD) != 0) {
+            mMoveAppButton.setText(R.string.move_app_to_internal);
+        } else {
+            mMoveAppButton.setText(R.string.move_app_to_sdcard);
+        }
+    }
+
+    private void initControlButtons() {
+        mUpdatedSysApp = (mAppInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
+        boolean enabled = true;
+        if (mUpdatedSysApp) {
+            mUninstallButton.setText(R.string.app_factory_reset);
+        } else if ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0){
+            mUninstallButton.setText(R.string.uninstall_text);
+        } else {
+            // Disable uninstall for system apps
+            enabled = false;
+        }
+        mUninstallButton.setEnabled(enabled);
+        if (enabled) {
+            // Register listener
+            mUninstallButton.setOnClickListener(this);
+        }
+        ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        List<RunningAppProcessInfo> rList = am.getRunningAppProcesses();
+        boolean running = false;
+        if (rList != null) {
+            for (RunningAppProcessInfo info : rList) {
+                if (info.pkgList != null) {
+                    for (String rpkg : info.pkgList) {
+                        if (rpkg.equals(mAppInfo.packageName)) {
+                            running = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        mForceStopButton.setEnabled(running);
+        if (running) {
+            mForceStopButton.setOnClickListener(this);
+        }
+    }
+
     /** Called when the activity is first created. */
     @Override
     protected void onCreate(Bundle icicle) {
@@ -205,21 +260,23 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         mAppSize.setText(appSizeStr);
         mDataSize = (TextView)findViewById(R.id.data_size_text);
         mDataSize.setText(dataSizeStr);
-         // Get AppButton
+        // Get Control button panel
-         mAppButton = ((Button)findViewById(R.id.uninstall_button));
+        View btnPanel = findViewById(R.id.control_buttons_panel);
-         // Get ManageSpaceButton
+        mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
-         mManageSpaceButton = (Button)findViewById(R.id.manage_space_button);
+        mForceStopButton.setText(R.string.force_stop);
-         if(mAppInfo.manageSpaceActivityName != null) {
+        mUninstallButton = (Button)btnPanel.findViewById(R.id.right_button);
-             mManageSpaceButton.setVisibility(View.VISIBLE);
+        initControlButtons();
-             mManageSpaceButton.setOnClickListener(this);
+        // Initialize clear data and move install location buttons
-         }
+        View data_buttons_panel = findViewById(R.id.data_buttons_panel);
+        mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.left_button);
+        mMoveAppButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
+        // Disable move for now
+        mMoveAppButton.setEnabled(false);
          // Cache section
-         mCachePanel = findViewById(R.id.cache_panel);
          mCacheSize = (TextView) findViewById(R.id.cache_size_text);
          mCacheSize.setText(mComputingStr);
          mClearCacheButton = (Button) findViewById(R.id.clear_cache_button);
-         mForceStopButton = (Button) findViewById(R.id.force_stop_button);
+
-         mForceStopButton.setOnClickListener(this);
          // Get list of preferred activities
          mActivitiesButton = (Button)findViewById(R.id.clear_activities_button);
          List<ComponentName> prefActList = new ArrayList<ComponentName>();
@@ -253,9 +310,10 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     
     private void refreshAppAttributes(PackageInfo pkgInfo) {
         setAppLabelAndIcon();
+        initControlButtons();
+        initDataButtons();
         // Version number of application
         setAppVersion(pkgInfo);
-        setAppBtnState();
         // Refresh size info
         if (mAppInfo != null && mAppInfo.packageName != null) {
             mPm.getPackageSizeInfo(mAppInfo.packageName, mSizeObserver);
@@ -286,38 +344,9 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         }
     }
 
-    // Utility method to set button state
-    private void setAppBtnState() {
-        boolean visible = true;
-        if  ((mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-            if ((mAppInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
-                mAppButtonState = AppButtonStates.FACTORY_RESET;
-                mAppButtonText = getText(R.string.app_factory_reset);
-            } else {
-                if ((mAppInfo.flags & ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA) == 0) {
-                    // Hide button if diableClearUserData is set
-                    mAppButtonState = AppButtonStates.NONE;
-                    visible = false;
-                } else {
-                    mAppButtonState = AppButtonStates.CLEAR_DATA;
-                    mAppButtonText = getText(R.string.clear_user_data_text);
-                }
-            }
-        } else {
-            mAppButtonState = AppButtonStates.UNINSTALL;
-            mAppButtonText = getText(R.string.uninstall_text);
-        }
-        if(visible) {
-            mAppButton.setText(mAppButtonText);
-            mAppButton.setVisibility(View.VISIBLE);
-        } else {
-            mAppButton.setVisibility(View.GONE);
-        }
-    }
-
     @Override
-    public void onStart() {
+    public void onResume() {
-        super.onStart();
+        super.onResume();
         PackageInfo pkgInfo;
         // Get application info again to refresh changed properties of application
         try {
@@ -338,7 +367,6 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         Intent intent = new Intent();
         intent.putExtra(ManageApplications.APP_CHG, appChanged);
         setResult(ManageApplications.RESULT_OK, intent);
-        mAppButton.setEnabled(false);
         if(finish) {
             finish();
         }
@@ -383,18 +411,11 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
                 mSizeInfo = newPs;
             }
         }
-        
+        // If data size is zero disable clear data button
+        if (newPs.dataSize == 0) {
+            mClearDataButton.setEnabled(false);
+        }
         long data = mSizeInfo.dataSize;
-        // Disable button if data is 0
-        if(mAppButtonState != AppButtonStates.NONE){
-            mAppButton.setText(mAppButtonText);
-            if((mAppButtonState == AppButtonStates.CLEAR_DATA) && (data == 0)) {
-                mAppButton.setEnabled(false);
-            } else {
-                mAppButton.setEnabled(true);
-                mAppButton.setOnClickListener(this);
-            }            
-        }
         refreshCacheInfo(newPs.cacheSize);
     }
     
@@ -415,12 +436,12 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     private void processClearMsg(Message msg) {
         int result = msg.arg1;
         String packageName = mAppInfo.packageName;
+        mClearDataButton.setText(R.string.clear_user_data_text);
         if(result == OP_SUCCESSFUL) {
-            Log.i(TAG, "Cleared user data for system package:"+packageName);
+            Log.i(TAG, "Cleared user data for package : "+packageName);
             mPm.getPackageSizeInfo(packageName, mSizeObserver);
         } else {
-            mAppButton.setText(R.string.clear_user_data_text);
+            mClearDataButton.setEnabled(true);
-            mAppButton.setEnabled(true);
         }
     }
     
@@ -428,11 +449,11 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
      * Private method to initiate clearing user data when the user clicks the clear data 
      * button for a system package
      */
-    private  void initiateClearUserDataForSysPkg() {
+    private  void initiateClearUserData() {
-        mAppButton.setEnabled(false);
+        mClearDataButton.setEnabled(false);
-        //invoke uninstall or clear user data based on sysPackage
+        // Invoke uninstall or clear user data based on sysPackage
         String packageName = mAppInfo.packageName;
-        Log.i(TAG, "Clearing user data for system package");
+        Log.i(TAG, "Clearing user data for package : " + packageName);
         if(mClearDataObserver == null) {
             mClearDataObserver = new ClearUserDataObserver();
         }
@@ -443,7 +464,7 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
             Log.i(TAG, "Couldnt clear application user data for package:"+packageName);
             showDialogInner(DLG_CANNOT_CLEAR_DATA);
         } else {
-                mAppButton.setText(R.string.recompute_size);
+            mClearDataButton.setText(R.string.recompute_size);
         }
     }
     
@@ -453,23 +474,35 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     }
     
     @Override
-    public Dialog onCreateDialog(int id) {
+    public Dialog onCreateDialog(int id, Bundle args) {
         switch (id) {
         case DLG_CLEAR_DATA:
             return new AlertDialog.Builder(this)
             .setTitle(getString(R.string.clear_data_dlg_title))
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(getString(R.string.clear_data_dlg_text))
-            .setPositiveButton(R.string.dlg_ok, this)
+            .setPositiveButton(R.string.dlg_ok,
-            .setNegativeButton(R.string.dlg_cancel, this)
+                    new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    // Clear user data here
+                    initiateClearUserData();
+                }
+            })
+            .setNegativeButton(R.string.dlg_cancel, null)
             .create();
         case DLG_FACTORY_RESET:
             return new AlertDialog.Builder(this)
             .setTitle(getString(R.string.app_factory_reset_dlg_title))
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setMessage(getString(R.string.app_factory_reset_dlg_text))
-            .setPositiveButton(R.string.dlg_ok, this)
+            .setPositiveButton(R.string.dlg_ok,
-            .setNegativeButton(R.string.dlg_cancel, this)
+                    new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    // Clear user data here
+                    uninstallPkg(mAppInfo.packageName);
+                }
+            })
+            .setNegativeButton(R.string.dlg_cancel, null)
             .create();
         case DLG_APP_NOT_FOUND:
             return new AlertDialog.Builder(this)
@@ -492,11 +525,26 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
             .setNeutralButton(R.string.dlg_ok,
                     new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
+                    mClearDataButton.setEnabled(false);
                     //force to recompute changed value
                     setIntentAndFinish(false, false);
                 }
             })
             .create();
+            case DLG_FORCE_STOP:
+                return new AlertDialog.Builder(this)
+                .setTitle(getString(R.string.force_stop_dlg_title))
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setMessage(getString(R.string.force_stop_dlg_text))
+                .setPositiveButton(R.string.dlg_ok,
+                    new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    // Force stop
+                    forceStopPackage(mAppInfo.packageName);
+                }
+            })
+            .setNegativeButton(R.string.dlg_cancel, null)
+            .create();
         }
         return null;
     }
@@ -509,27 +557,35 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         setIntentAndFinish(true, true);
     }
 
+    private void forceStopPackage(String pkgName) {
+        ActivityManager am = (ActivityManager)getSystemService(
+                Context.ACTIVITY_SERVICE);
+        am.forceStopPackage(pkgName);
+    }
+
     /*
      * Method implementing functionality of buttons clicked
      * @see android.view.View.OnClickListener#onClick(android.view.View)
      */
     public void onClick(View v) {
         String packageName = mAppInfo.packageName;
-        if(v == mAppButton) {
+        if(v == mUninstallButton) {
-            if (mAppButtonState == AppButtonStates.CLEAR_DATA) {
+            if (mUpdatedSysApp) {
-                showDialogInner(DLG_CLEAR_DATA);
-            } else if (mAppButtonState == AppButtonStates.FACTORY_RESET) {
                 showDialogInner(DLG_FACTORY_RESET);
-            } else if (mAppButtonState == AppButtonStates.UNINSTALL) {
+            } else {
                 uninstallPkg(packageName);
             }
         } else if(v == mActivitiesButton) {
             mPm.clearPackagePreferredActivities(packageName);
             mActivitiesButton.setEnabled(false);
-        } else if(v == mManageSpaceButton) {
+        } else if(v == mClearDataButton) {
+            if (mAppInfo.manageSpaceActivityName != null) {
                 Intent intent = new Intent(Intent.ACTION_DEFAULT);
                 intent.setClassName(mAppInfo.packageName, mAppInfo.manageSpaceActivityName);
                 startActivityForResult(intent, -1);
+            } else {
+                showDialogInner(DLG_CLEAR_DATA);
+            }
         } else if (v == mClearCacheButton) {
             // Lazy initialization of observer
             if (mClearCacheObserver == null) {
@@ -537,23 +593,14 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
             }
             mPm.deleteApplicationCacheFiles(packageName, mClearCacheObserver);
         } else if (v == mForceStopButton) {
-            ActivityManager am = (ActivityManager)getSystemService(
+            // TODO Once framework supports a pre-broadcast to
-                    Context.ACTIVITY_SERVICE);
+            // actually find out if an application will be restarted right
-            am.forceStopPackage(packageName);
+            // after its killed, there is no way we can determine if
-        }
+            // a force stop will really kill the app. So just ignore
-    }
+            // the dialog for now and force stop the package. Please note
-
+            // that the button cannot be enabled or disabled since
-    public void onClick(DialogInterface dialog, int which) {
+            // we do not have this info for now.
-        if(which == AlertDialog.BUTTON_POSITIVE) {
+            forceStopPackage(mAppInfo.packageName);
-            if (mAppButtonState == AppButtonStates.CLEAR_DATA) {
-                // Invoke uninstall or clear user data based on sysPackage
-                initiateClearUserDataForSysPkg();
-            } else if (mAppButtonState == AppButtonStates.FACTORY_RESET) {
-                // Initiate package installer to delete package
-                uninstallPkg(mAppInfo.packageName);
-            }
-        } else {
-            //cancel do nothing just retain existing screen
         }
     }
 }