Merge "Apply material design make-over to uninstall path." into nyc-dev (ee50fa56) · Commits · e / os / android_packages_apps_PackageInstaller

res/layout/uninstall_progress.xml

+60 −85

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

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<!-- Button bar with OK button -->
		<LinearLayout android:id="@+id/ok_panel"
		<include layout="@layout/app_details"
		android:id="@+id/app_snippet"/>

		<LinearLayout android:id="@+id/progress_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="true"
		android:layout_weight="1"
		android:gravity="center"
		android:orientation="vertical"
		android:divider="?android:attr/dividerHorizontal"
		android:showDividers="beginning"
		android:paddingTop="16dip">
		android:padding="16dp">

		<LinearLayout
		style="?android:attr/buttonBarStyle"
		android:layout_width="match_parent"
		<ImageView android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:measureWithLargestChild="true">
		android:layout_marginBottom="12dp"
		android:src="@drawable/ic_android_92"
		android:contentDescription="@null" />

		<LinearLayout android:id="@+id/leftSpacer"
		android:layout_weight="0.5"
		android:layout_width="0dip"
		<ProgressBar android:id="@+id/progress_bar"
		android:layout_width="250dp"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:visibility="gone" />
		android:indeterminate="true"
		style="?android:attr/progressBarStyleHorizontal">
		</ProgressBar>

		<Button android:id="@+id/ok_button"
		android:layout_width="0dip"
		<TextView android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_weight="1"
		android:text="@string/ok"
		android:maxLines="2"
		style="?android:attr/buttonBarButtonStyle" />

		<LinearLayout android:id="@+id/rightSpacer"
		android:layout_width="0dip"
		android:layout_weight="0.5"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:visibility="gone" />
		android:gravity="center_horizontal"
		android:text="@string/uninstalling"
		android:textAppearance="?android:attr/textAppearanceMedium" />

		</LinearLayout>
		</LinearLayout>

		<include
		layout="@layout/app_details"
		android:id="@+id/app_snippet"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_alignParentTop="true" />

		<FrameLayout
		android:id="@+id/top_divider"
		<!-- Status view is shown after progress view is removed -->
		<ScrollView android:id="@+id/status_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="4dip"
		android:paddingStart="16dip"
		android:paddingEnd="16dip"
		android:layout_below="@id/app_snippet">
		<ProgressBar
		android:id="@+id/progress_bar"
		style="?android:attr/progressBarStyleHorizontal"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		</FrameLayout>

		<LinearLayout
		android:id="@+id/uninstall_holder"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_above="@id/ok_panel"
		android:layout_below="@id/top_divider"
		android:orientation="vertical">
		android:layout_weight="1"
		android:visibility="gone"
		android:padding="16dp">

		<ScrollView
		android:id="@+id/uninstalling_scrollview"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:paddingStart="24dip"
		android:paddingEnd="24dip"
		android:paddingTop="8dip"
		android:paddingBottom="8dip"
		android:fillViewport="false">

		<TextView
		android:id="@+id/center_text"
		<TextView android:id="@+id/status_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="start"
		android:text="@string/uninstalling"
		android:textAppearance="?android:attr/textAppearanceMedium"/>
		</ScrollView>

		<LinearLayout android:id="@+id/ok_panel"
		style="?android:attr/buttonBarStyle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:measureWithLargestChild="true"
		android:visibility="gone"
		android:padding="8dip">

		<!-- spacer to push buttons to the right -->
		<View android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<Button android:id="@+id/device_manager_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:visibility="gone"
		android:text="@string/manage_device_administrators"
		android:maxLines="2"
		android:text="@string/manage_device_administrators" />
		style="?android:attr/buttonBarButtonStyle" />

		<Button android:id="@+id/users_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:visibility="gone"
		android:text="@string/manage_users"
		android:maxLines="2"
		style="?android:attr/buttonBarButtonStyle" />

		<Button android:id="@+id/ok_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/ok"
		android:maxLines="2"
		android:text="@string/manage_users" />
		style="?android:attr/buttonBarButtonStyle" />

		</LinearLayout>

		</RelativeLayout>
		</LinearLayout>

src/com/android/packageinstaller/UninstallAppProgress.java

+4 −14

Original line number	Diff line number	Diff line
		@@ -62,12 +62,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
		private UserHandle mUser;
		private IBinder mCallback;

		private TextView mStatusTextView;
		private Button mOkButton;
		private Button mDeviceManagerButton;
		private Button mUsersButton;
		private ProgressBar mProgressBar;
		private View mOkPanel;
		private volatile int mResultCode = -1;

		private static final int UNINSTALL_COMPLETE = 1;
		@@ -202,11 +199,10 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
		statusText = getString(R.string.uninstall_failed);
		break;
		}
		mStatusTextView.setText(statusText);

		// Hide the progress bar; Show the ok button
		mProgressBar.setVisibility(View.INVISIBLE);
		mOkPanel.setVisibility(View.VISIBLE);
		findViewById(R.id.progress_view).setVisibility(View.GONE);
		findViewById(R.id.status_view).setVisibility(View.VISIBLE);
		((TextView)findViewById(R.id.status_text)).setText(statusText);
		findViewById(R.id.ok_panel).setVisibility(View.VISIBLE);
		break;
		default:
		break;
		@@ -260,8 +256,6 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
		// Initialize views
		View snippetView = findViewById(R.id.app_snippet);
		PackageUtil.initSnippetForInstalledApp(this, mAppInfo, snippetView);
		mStatusTextView = (TextView) findViewById(R.id.center_text);
		mStatusTextView.setText(R.string.uninstalling);
		mDeviceManagerButton = (Button) findViewById(R.id.device_manager_button);
		mUsersButton = (Button) findViewById(R.id.users_button);
		mDeviceManagerButton.setVisibility(View.GONE);
		@@ -286,13 +280,9 @@ public class UninstallAppProgress extends Activity implements OnClickListener {
		finish();
		}
		});
		mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
		mProgressBar.setIndeterminate(true);
		// Hide button till progress is being displayed
		mOkPanel = (View) findViewById(R.id.ok_panel);
		mOkButton = (Button) findViewById(R.id.ok_button);
		mOkButton.setOnClickListener(this);
		mOkPanel.setVisibility(View.INVISIBLE);
		IPackageManager packageManager =
		IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
		PackageDeleteObserver observer = new PackageDeleteObserver();