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

Commit 7118c16f authored by Robert Horvath's avatar Robert Horvath Committed by Automerger Merge Worker
Browse files

Merge "Improve LogAccessDialogActivity's rotation handling" into tm-dev am:... 

Merge "Improve LogAccessDialogActivity's rotation handling" into tm-dev am: ea71e9e9 am: 70b9c5e2

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



Change-Id: I41ec257ff61b97b5b66e3c626d886198fc542c23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5bf6c03 70b9c5e2

core/res/res/layout/log_access_user_consent_dialog_permission.xml

+75 −66
Original line number Original line Diff line number Diff line
@@ -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>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;