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

Commit ea3a83e2 authored by tim peng's avatar tim peng Committed by Android (Google) Code Review
Browse files

Merge "Incorrect panel layout after rotation" into rvc-dev

parents 79a38a73 e54e0296

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -3180,6 +3180,7 @@ 
            android:theme="@style/Theme.Panel"

            android:launchMode="singleInstance"

            android:excludeFromRecents="true"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:exported="true">

                 <intent-filter>

                     <action android:name="android.settings.panel.action.INTERNET_CONNECTIVITY" />

src/com/android/settings/panel/SettingsPanelActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ package com.android.settings.panel; 
import static com.android.settingslib.media.MediaOutputSliceConstants.EXTRA_PACKAGE_NAME;



import android.content.Intent;

import android.content.res.Configuration;

import android.os.Bundle;

import android.util.Log;

import android.view.Gravity;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;
@@ -43,6 +45,8 @@ public class SettingsPanelActivity extends FragmentActivity { 


    @VisibleForTesting

    final Bundle mBundle = new Bundle();

    @VisibleForTesting

    boolean mForceCreation = false;



    /**

     * Key specifying which Panel the app is requesting.
@@ -59,8 +63,6 @@ public class SettingsPanelActivity extends FragmentActivity { 
     */

    public static final String KEY_MEDIA_PACKAGE_NAME = "PANEL_MEDIA_PACKAGE_NAME";



    private boolean mForceCreation = false;



    @Override

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -87,6 +89,12 @@ public class SettingsPanelActivity extends FragmentActivity { 
        mForceCreation = true;

    }



    @Override

    public void onConfigurationChanged(@NonNull Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        mForceCreation = true;

    }



    private void createOrUpdatePanel(boolean shouldForceCreation) {

        final Intent callingIntent = getIntent();

        if (callingIntent == null) {

tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.content.Intent;

import android.content.res.Configuration;

import android.os.Build;

import android.view.Window;

import android.view.WindowManager;
@@ -139,4 +140,12 @@ public class SettingsPanelActivityTest { 
        assertThat(paramCaptor.getValue().privateFlags

                & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo(0);

    }



    @Test

    public void onConfigurationChanged_shouldForceUpdate() {

        mSettingsPanelActivity.mForceCreation = false;

        mSettingsPanelActivity.onConfigurationChanged(new Configuration());



        assertThat(mSettingsPanelActivity.mForceCreation).isTrue();

    }

}