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

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

@@ -16,11 +16,14 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="380dp" android:layout_width="380dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:paddingLeft="24dp" android:paddingLeft="24dp"
@@ -58,6 +61,11 @@
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:gravity="center" /> android:gravity="center" />
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -90,3 +98,4 @@
android:gravity="center" /> android:gravity="center" />
</LinearLayout> </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 @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mAlert != null && mAlert.isShowing()) { if (!isChangingConfigurations() && mAlert != null && mAlert.isShowing()) {
mAlert.dismiss(); mAlert.dismiss();
} }
mAlert = null; mAlert = null;