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

Commit 42c57293 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I57d59aa3,Ib7453a79 

* changes:
  Report fully drawn when all settings are loaded.
  Make android.settings.SETTINGS intent go into homepage.
parents 0a30175b 293883b2

AndroidManifest.xml

+9 −10
Original line number Diff line number Diff line
@@ -111,13 +111,9 @@ 
        <uses-library android:name="org.apache.http.legacy" />

        <!-- Settings -->



        <activity android:name="Settings"

        <activity android:name="SettingsActivity"

                android:label="@string/settings_label_launcher"

                android:launchMode="singleTask">

            <intent-filter android:priority="1">

                <action android:name="android.settings.SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>
@@ -126,6 +122,12 @@ 
                  android:label="@string/settings_label_launcher"

                  android:theme="@style/Theme.Settings.Home"

                  android:launchMode="singleTask">

            <intent-filter android:priority="1">

                <action android:name="android.settings.SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <activity android:name=".network.telephony.MobileSettingsActivity"
@@ -2974,15 +2976,12 @@ 


        <receiver

            android:name=".slices.SliceBroadcastReceiver"

            android:exported="false">

        </receiver>

            android:exported="false" />



        <receiver

            android:name=".slices.SliceRelayReceiver"

            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"

            android:exported="true">



        </receiver>

            android:exported="true" />



        <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send

             PendingIntent to it-->

src/com/android/settings/SettingsActivity.java

+2 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settings;



import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;



import android.app.ActionBar;

import android.app.ActivityManager;

import android.content.BroadcastReceiver;
@@ -248,10 +246,8 @@ public class SettingsActivity extends SettingsBaseActivity 
        // Getting Intent properties can only be done after the super.onCreate(...)

        final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);



        final ComponentName cn = intent.getComponent();

        final String className = cn.getClassName();



        mIsShowingDashboard = className.equals(Settings.class.getName());

        mIsShowingDashboard = TextUtils.equals(

                SettingsActivity.class.getName(), intent.getComponent().getClassName());



        // This is a "Sub Settings" when:

        // - this is a real SubSettings

src/com/android/settings/dashboard/DashboardFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -321,6 +321,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
        displayResourceTiles();



        refreshDashboardTiles(TAG);



        final Activity activity = getActivity();

        if (activity != null) {

            Log.d(TAG, "All preferences added, reporting fully drawn");

            activity.reportFullyDrawn();

        }

    }



    /**

src/com/android/settings/homepage/SettingsHomepageActivity.java

+3 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.homepage;



import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.util.FeatureFlagUtils;
@@ -27,6 +26,7 @@ import androidx.fragment.app.FragmentManager; 
import androidx.fragment.app.FragmentTransaction;



import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.core.FeatureFlags;

import com.android.settings.core.SettingsBaseActivity;

import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
@@ -38,9 +38,8 @@ public class SettingsHomepageActivity extends SettingsBaseActivity { 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        if (!isDynamicHomepageEnabled(this)) {

            final Intent settings = new Intent();

            settings.setAction("android.settings.SETTINGS");

        if (!FeatureFlagUtils.isEnabled(this, FeatureFlags.DYNAMIC_HOMEPAGE)) {

            final Intent settings = new Intent(this, SettingsActivity.class);

            startActivity(settings);

            finish();

            return;
@@ -56,10 +55,6 @@ public class SettingsHomepageActivity extends SettingsBaseActivity { 
        showFragment(new TopLevelSettings(), R.id.main_content);

    }



    public static boolean isDynamicHomepageEnabled(Context context) {

        return FeatureFlagUtils.isEnabled(context, FeatureFlags.DYNAMIC_HOMEPAGE);

    }



    private void showFragment(Fragment fragment, int id) {

        final FragmentManager fragmentManager = getSupportFragmentManager();

        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();

tests/robotests/src/com/android/settings/SettingsActivityTest.java

+6 −8
Original line number Diff line number Diff line
@@ -71,10 +71,9 @@ public class SettingsActivityTest { 
    @Test

    public void onCreate_deviceNotProvisioned_shouldDisableSearch() {

        Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 0);

        final Intent intent = new Intent(mContext, Settings.class);

        final SettingsActivity activity =

                Robolectric.buildActivity(SettingsActivity.class, intent).create(

                        Bundle.EMPTY).get();

        final SettingsActivity activity = Robolectric.buildActivity(SettingsActivity.class)

                .create(Bundle.EMPTY)

                .get();



        assertThat(activity.findViewById(R.id.search_bar).getVisibility())

                .isEqualTo(View.INVISIBLE);
@@ -83,10 +82,9 @@ public class SettingsActivityTest { 
    @Test

    public void onCreate_deviceProvisioned_shouldEnableSearch() {

        Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 1);

        final Intent intent = new Intent(mContext, Settings.class);

        final SettingsActivity activity =

                Robolectric.buildActivity(SettingsActivity.class, intent).create(

                        Bundle.EMPTY).get();

        final SettingsActivity activity = Robolectric.buildActivity(SettingsActivity.class)

                .create(Bundle.EMPTY)

                .get();



        assertThat(activity.findViewById(R.id.search_bar).getVisibility()).isEqualTo(View.VISIBLE);

    }