Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9cf8f9 authored by Robert Horvath's avatar Robert Horvath
Browse files

Improve LogAccessDialogActivity's rotation handling 

1. Do not dismiss the dialog on configuration change, such as rotation.

When the device was rotated, the dialog was automatically dismissed as
the activity was destroyed & recreated in the new configuration.

2. Wrap the dialog content view in a ScrolLView

In landscape orientation (and smaller phone screens), the dialog content
may not fit entirely on the screen. By wrapping it in a ScrollView, all
the dialog text and buttons can still be accessed in landscape / smaller
screens.

Bug: 231436416
Test: Manual, on adt3
Test: On phone emulator in light/dark mode & different orientations
Change-Id: Ibf3ecf93a237783ce4909a24a959c3ea243ab766
parent 3c8ff471

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>

services/core/java/com/android/server/logcat/LogAccessDialogActivity.java

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