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

Merge "Improve LogAccessDialogActivity's rotation handling" into tm-dev am: ea71e9e9c4 am: 70b9c5e24a am: aef9b65688

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164943

Change-Id: Ia547241da976241dfbcea15980b6e42fbf9666ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robert Horvath
2022-05-30 12:32:44 +00:00
committed by Automerger Merge Worker
parent 0cc2a4ee4f aef9b65688
commit b3e457f770
2 changed files with 77 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
core/res/res/layout/log_access_user_consent_dialog_permission.xml
View File

@@ -16,77 +16,86 @@
** limitations under the License.
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="380dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp">
<ImageView
android:id="@+id/log_access_image_view"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_doc_document"
tools:layout_editor_absoluteX="148dp"
tools:layout_editor_absoluteY="35dp"
android:gravity="center" />
<TextView
android:id="@+id/log_access_dialog_title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/log_access_confirmation_title"
android:textAppearance="@style/AllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
<TextView
android:id="@+id/log_access_dialog_body"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginBottom="40dp"
android:text="@string/log_access_confirmation_body"
android:textAppearance="@style/PrimaryAllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
<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:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/log_access_dialog_allow_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/log_access_confirmation_allow"
style="@style/PermissionGrantButtonTop"
android:textAppearance="@style/PermissionGrantButtonTextAppearance"
android:layout_marginBottom="5dp"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp">
<ImageView
android:id="@+id/log_access_image_view"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_doc_document"
tools:layout_editor_absoluteX="148dp"
tools:layout_editor_absoluteY="35dp"
android:gravity="center" />
<Button
android:id="@+id/log_access_dialog_deny_button"
android:layout_width="match_parent"
<TextView
android:id="@+id/log_access_dialog_title"
android:layout_height="wrap_content"
android:text="@string/log_access_confirmation_deny"
style="@style/PermissionGrantButtonBottom"
android:textAppearance="@style/PermissionGrantButtonTextAppearance"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:layout_width="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/log_access_confirmation_title"
android:textAppearance="@style/AllowLogAccess"
android:textColor="?android:attr/textColorPrimary"
android:gravity="center" />
<TextView
android:id="@+id/log_access_dialog_body"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginBottom="40dp"
android:text="@string/log_access_confirmation_body"
android:textAppearance="@style/PrimaryAllowLogAccess"
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"
android:layout_height="wrap_content">
<Button
android:id="@+id/log_access_dialog_allow_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/log_access_confirmation_allow"
style="@style/PermissionGrantButtonTop"
android:textAppearance="@style/PermissionGrantButtonTextAppearance"
android:layout_marginBottom="5dp"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:gravity="center" />
<Button
android:id="@+id/log_access_dialog_deny_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/log_access_confirmation_deny"
style="@style/PermissionGrantButtonBottom"
android:textAppearance="@style/PermissionGrantButtonTextAppearance"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:clipToOutline="true"
android:gravity="center" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

2
services/core/java/com/android/server/logcat/LogAccessDialogActivity.java
View File

@@ -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;