Merge "Improve LogAccessDialogActivity's rotation handling" into tm-dev (ea71e9e9) · Commits · e / os / android_frameworks_base

core/res/res/layout/log_access_user_consent_dialog_permission.xml

+75 −66

Original line number	Diff line number	Diff line
		@@ -16,11 +16,14 @@
		** limitations under the License.
		*/
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		android:layout_width="380dp"
		android:layout_height="match_parent"
		android:clipToPadding="false">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:gravity="center"
		android:paddingLeft="24dp"
		@@ -58,6 +61,11 @@
		android:textColor="?android:attr/textColorPrimary"
		android:gravity="center" />

		<Space
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		@@ -90,3 +98,4 @@
		android:gravity="center" />
		</LinearLayout>
		</LinearLayout>
		</ScrollView>

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ public class LogAccessDialogActivity extends Activity implements
		@Override
		protected void onDestroy() {
		super.onDestroy();
		if (mAlert != null && mAlert.isShowing()) {
		if (!isChangingConfigurations() && mAlert != null && mAlert.isShowing()) {
		mAlert.dismiss();
		}
		mAlert = null;