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

Commit d3d36e12 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9248884 from 049deec9 to tm-qpr2-release 

Change-Id: I3105814036d562c9ac0744ea536ca66fad60b850
parents b102f331 049deec9

src/com/android/settings/applications/manageapplications/ManageApplications.java

+1 −0
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ public class ManageApplications extends InstrumentedFragment 
            mSearchView = (SearchView) searchMenuItem.getActionView();

            mSearchView.setQueryHint(getText(R.string.search_settings));

            mSearchView.setOnQueryTextListener(this);

            mSearchView.setMaxWidth(Integer.MAX_VALUE);

            if (mExpandSearch) {

                searchMenuItem.expandActionView();

            }

src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ public abstract class BaseTimeZonePicker extends InstrumentedFragment 


            mSearchView.setQueryHint(getText(mSearchHintResId));

            mSearchView.setOnQueryTextListener(this);

            mSearchView.setMaxWidth(Integer.MAX_VALUE);



            if (mDefaultExpandSearch) {

                searchMenuItem.expandActionView();

src/com/android/settings/print/PrintServiceSettingsFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
        MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);

        if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {

            mSearchView = (SearchView) searchItem.getActionView();

            mSearchView.setMaxWidth(Integer.MAX_VALUE);

            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {

                @Override

                public boolean onQueryTextSubmit(String query) {

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.UserManager; 
import android.provider.Settings;

import android.util.EventLog;

import android.util.Log;

import android.view.WindowManager;



import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.FragmentTransaction;
@@ -99,6 +100,7 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);



        if (savedInstanceState != null) {

            String qrCode = savedInstanceState.getString(KEY_QR_CODE);

tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.settings.wifi.dpp;



import static android.view.WindowManager.LayoutParams.FLAG_SECURE;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;
@@ -72,6 +76,12 @@ public class WifiDppConfiguratorActivityTest { 
                Robolectric.setupActivity(WifiDppConfiguratorActivity.class);

    }



    @Test

    public void launchActivity_shouldAddFlagSecure() {

        assertThat(mActivity.getWindow().getAttributes().flags & FLAG_SECURE)

                .isEqualTo(FLAG_SECURE);

    }



    @Test

    public void handleIntent_isGuestUser_shouldFinish() {

        when(mUserManager.isGuestUser()).thenReturn(true);