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

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

Merge "Remove dead code."

parents 04dd29fc c3fd2899

src/com/android/settings/SettingsInitialize.java

+6 −4
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import static android.content.pm.PackageManager.GET_META_DATA; 
import static android.content.pm.PackageManager.GET_RESOLVED_FILTER;

import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -51,7 +53,6 @@ public class SettingsInitialize extends BroadcastReceiver { 
    private static final String TAG = "Settings";

    private static final String PRIMARY_PROFILE_SETTING =

            "com.android.settings.PRIMARY_PROFILE_CONTROLLED";

    private static final String SETTINGS_PACKAGE = "com.android.settings";

    private static final String WEBVIEW_IMPLEMENTATION_ACTIVITY = ".WebViewImplementation";



    @Override
@@ -113,7 +114,8 @@ public class SettingsInitialize extends BroadcastReceiver { 
            return;

        }

        ComponentName settingsComponentName =

            new ComponentName(SETTINGS_PACKAGE, SETTINGS_PACKAGE + WEBVIEW_IMPLEMENTATION_ACTIVITY);

                new ComponentName(SETTINGS_PACKAGE_NAME,

                        SETTINGS_PACKAGE_NAME + WEBVIEW_IMPLEMENTATION_ACTIVITY);

        pm.setComponentEnabledSetting(settingsComponentName,

                userInfo.isAdmin() ?

                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED :

src/com/android/settings/Utils.java

+1 −10
Original line number Diff line number Diff line
@@ -111,16 +111,7 @@ public final class Utils extends com.android.settingslib.Utils { 
     */

    public static final int UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY = 1;



    /**

     * Color spectrum to use to indicate badness.  0 is completely transparent (no data),

     * 1 is most bad (red), the last value is least bad (green).

     */

    public static final int[] BADNESS_COLORS = new int[] {

            0x00000000, 0xffc43828, 0xffe54918, 0xfff47b00,

            0xfffabf2c, 0xff679e37, 0xff0a7f42

    };



    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";

    public static final String SETTINGS_PACKAGE_NAME = "com.android.settings";



    public static final String OS_PKG = "os";

src/com/android/settings/applications/RecentAppsPreferenceController.java

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


package com.android.settings.applications;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.Application;

import android.app.settings.SettingsEnums;

import android.app.usage.UsageStats;
@@ -91,7 +93,7 @@ public class RecentAppsPreferenceController extends AbstractPreferenceController 
        SKIP_SYSTEM_PACKAGES.addAll(Arrays.asList(

                "android",

                "com.android.phone",

                "com.android.settings",

                SETTINGS_PACKAGE_NAME,

                "com.android.systemui",

                "com.android.providers.calendar",

                "com.android.providers.media"

src/com/android/settings/biometrics/BiometricEnrollActivity.java

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


package com.android.settings.biometrics;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.app.settings.SettingsEnums;

import android.content.Intent;

import android.content.pm.PackageManager;
@@ -33,8 +35,6 @@ import com.android.settings.core.InstrumentedActivity; 
 */

public class BiometricEnrollActivity extends InstrumentedActivity {



    private static final String SETTINGS_PACKAGE = "com.android.settings";



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -44,9 +44,10 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 


        // This logic may have to be modified on devices with multiple biometrics.

        if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {

            intent.setClassName(SETTINGS_PACKAGE, FingerprintEnrollIntroduction.class.getName());

            intent.setClassName(SETTINGS_PACKAGE_NAME,

                    FingerprintEnrollIntroduction.class.getName());

        } else if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {

            intent.setClassName(SETTINGS_PACKAGE, FaceEnrollIntroduction.class.getName());

            intent.setClassName(SETTINGS_PACKAGE_NAME, FaceEnrollIntroduction.class.getName());

        }



        startActivity(intent);

src/com/android/settings/biometrics/BiometricEnrollBase.java

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


package com.android.settings.biometrics;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.annotation.Nullable;

import android.content.Intent;

import android.content.res.Resources;
@@ -148,7 +150,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 


    protected Intent getFingerprintEnrollingIntent() {

        Intent intent = new Intent();

        intent.setClassName("com.android.settings", FingerprintEnrollEnrolling.class.getName());

        intent.setClassName(SETTINGS_PACKAGE_NAME, FingerprintEnrollEnrolling.class.getName());

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);