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

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

Merge "Migrate all remaining condition cards to v2."

parents 0f54511e 7373ec04

AndroidManifest.xml

+6 −3
Original line number Diff line number Diff line
@@ -1892,7 +1892,8 @@ 
            android:name=".development.DevelopmentSettingsDisabledActivity"

            android:icon="@drawable/ic_settings_development"

            android:label="@string/development_settings_title"

            android:theme="@android:style/Theme.NoDisplay">

            android:excludeFromRecents="true"

            android:theme="@style/Transparent">

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

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

                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -3069,10 +3070,12 @@ 
            </intent-filter>

        </service>



        <activity android:name=".HelpTrampoline"

        <activity

            android:name=".HelpTrampoline"

            android:exported="true"

            android:theme="@android:style/Theme.NoDisplay"

            android:theme="@style/Transparent"

            android:permission="android.permission.DUMP"

            android:excludeFromRecents="true"

            android:enabled="@bool/config_has_help" />



        <activity android:name=".applications.autofill.AutofillPickerActivity"

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

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ public class DashboardSummary extends InstrumentedFragment 


        mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);



        mConditionManager = ConditionManager.get(activity, false);

        if (com.android.settings.homepage.conditional.v2.ConditionManager.isEnabled(activity)) {

            mConditionManager = null;

            mConditionManager2 =

src/com/android/settings/homepage/conditional/AbnormalRingerConditionBase.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.provider.Settings; 


import com.android.settings.R;



@Deprecated

public abstract class AbnormalRingerConditionBase extends Condition {



    private final IntentFilter mFilter;

src/com/android/settings/homepage/conditional/AirplaneModeCondition.java

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.settings.R;

import com.android.settingslib.WirelessUtils;



/**

 * @deprecated in favor of {@link AirplaneModeConditionCard}.

 */

@Deprecated

public class AirplaneModeCondition extends Condition {

    public static String TAG = "APM_Condition";

src/com/android/settings/homepage/conditional/BackgroundDataCondition.java

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.settings.R;

import com.android.settings.Settings;



@Deprecated

public class BackgroundDataCondition extends Condition {



    public BackgroundDataCondition(ConditionManager manager) {