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

Commit 09ae55b5 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Cleanup: Don't use getApplicationContext() where not needed. 

Change-Id: Ie2232857cf88c98c9f2b76996a500e3d3696e6e2
parent 188b0cb3

src/com/android/settings/SecuritySettings.java

+7 −9
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ public class SecuritySettings extends SettingsPreferenceFragment 
        if (args != null) {

            isCmSecurity = args.getBoolean("cm_security");

        }

        ContentResolver resolver = getActivity().getApplicationContext().getContentResolver();



        final ContentResolver resolver = getContentResolver();

        final Resources res = getResources();



        // Add package manager to check if features are available
@@ -525,8 +526,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 


    private void updateSlideAfterTimeoutSummary() {

        // Update summary message with current value

        long currentTimeout = Settings.System.getInt(getActivity().getApplicationContext()

                .getContentResolver(),

        long currentTimeout = Settings.System.getInt(getContentResolver(),

                Settings.System.SCREEN_LOCK_SLIDE_TIMEOUT_DELAY, 5000);

        final CharSequence[] entries = mSlideLockTimeoutDelay.getEntries();

        final CharSequence[] values = mSlideLockTimeoutDelay.getEntryValues();
@@ -547,8 +547,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 


    private void updateSlideAfterScreenOffSummary() {

        // Update summary message with current value

        long currentTimeout = Settings.System.getInt(getActivity().getApplicationContext()

                .getContentResolver(),

        long currentTimeout = Settings.System.getInt(getContentResolver(),

                Settings.System.SCREEN_LOCK_SLIDE_SCREENOFF_DELAY, 0);

        final CharSequence[] entries = mSlideLockScreenOffDelay.getEntries();

        final CharSequence[] values = mSlideLockScreenOffDelay.getEntryValues();
@@ -785,13 +784,12 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            checkPowerInstantLockDependency();

        } else if (preference == mSlideLockTimeoutDelay) {

            int slideTimeoutDelay = Integer.valueOf((String) value);

            Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),

                    Settings.System.SCREEN_LOCK_SLIDE_TIMEOUT_DELAY,

                    slideTimeoutDelay);

            Settings.System.putInt(getContentResolver(),

                    Settings.System.SCREEN_LOCK_SLIDE_TIMEOUT_DELAY, slideTimeoutDelay);

            updateSlideAfterTimeoutSummary();

        } else if (preference == mSlideLockScreenOffDelay) {

            int slideScreenOffDelay = Integer.valueOf((String) value);

            Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),

            Settings.System.putInt(getContentResolver(),

                    Settings.System.SCREEN_LOCK_SLIDE_SCREENOFF_DELAY, slideScreenOffDelay);

            updateSlideAfterScreenOffSummary();

        } else if (preference == mSmsSecurityCheck) {

src/com/android/settings/SoundSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements 
        cal.set(Calendar.HOUR_OF_DAY, hr);

        cal.set(Calendar.MINUTE, mn);

        Date date = cal.getTime();

        return DateFormat.getTimeFormat(getActivity().getApplicationContext()).format(date);

        return DateFormat.getTimeFormat(getActivity()).format(date);

    }



    @Override

src/com/android/settings/cmstats/ReportingService.java

+6 −5
Original line number Diff line number Diff line
@@ -66,12 +66,13 @@ public class ReportingService extends Service { 
    private class StatsUploadTask extends AsyncTask<Void, Void, Boolean> {

        @Override

        protected Boolean doInBackground(Void... params) {

            String deviceId = Utilities.getUniqueID(getApplicationContext());

            final Context context = ReportingService.this;

            String deviceId = Utilities.getUniqueID(context);

            String deviceName = Utilities.getDevice();

            String deviceVersion = Utilities.getModVersion();

            String deviceCountry = Utilities.getCountryCode(getApplicationContext());

            String deviceCarrier = Utilities.getCarrier(getApplicationContext());

            String deviceCarrierId = Utilities.getCarrierId(getApplicationContext());

            String deviceCountry = Utilities.getCountryCode(context);

            String deviceCarrier = Utilities.getCarrier(context);

            String deviceCarrierId = Utilities.getCarrierId(context);



            Log.d(TAG, "SERVICE: Device ID=" + deviceId);

            Log.d(TAG, "SERVICE: Device Name=" + deviceName);
@@ -81,7 +82,7 @@ public class ReportingService extends Service { 
            Log.d(TAG, "SERVICE: Carrier ID=" + deviceCarrierId);



            // report to google analytics

            GoogleAnalytics ga = GoogleAnalytics.getInstance(ReportingService.this);

            GoogleAnalytics ga = GoogleAnalytics.getInstance(context);

            Tracker tracker = ga.getTracker(getString(R.string.ga_trackingId));

            tracker.sendEvent(deviceName, deviceVersion, deviceCountry, null);

src/com/android/settings/cyanogenmod/NotificationDrawer.java

+29 −40
Original line number Diff line number Diff line
@@ -159,15 +159,11 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 


            PreferenceScreen prefSet = getPreferenceScreen();

            PackageManager pm = getPackageManager();

            final ContentResolver resolver = getContentResolver();



            if (getActivity().getApplicationContext() == null) {

                return;

            }



            mBrightnessMode = (MultiSelectListPreference) prefSet

                    .findPreference(EXP_BRIGHTNESS_MODE);

            String storedBrightnessMode = Settings.System.getString(getActivity()

                    .getApplicationContext().getContentResolver(),

            mBrightnessMode = (MultiSelectListPreference)

                    prefSet.findPreference(EXP_BRIGHTNESS_MODE);

            String storedBrightnessMode = Settings.System.getString(resolver,

                    Settings.System.EXPANDED_BRIGHTNESS_MODE);

            if (storedBrightnessMode != null) {

                String[] brightnessModeArray = TextUtils.split(storedBrightnessMode, SEPARATOR);
@@ -180,8 +176,7 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
            mScreenTimeoutMode = (ListPreference) prefSet.findPreference(EXP_SCREENTIMEOUT_MODE);

            mScreenTimeoutMode.setOnPreferenceChangeListener(this);

            mRingMode = (MultiSelectListPreference) prefSet.findPreference(EXP_RING_MODE);

            String storedRingMode = Settings.System.getString(getActivity()

                    .getApplicationContext().getContentResolver(),

            String storedRingMode = Settings.System.getString(resolver,

                    Settings.System.EXPANDED_RING_MODE);

            if (storedRingMode != null) {

                String[] ringModeArray = TextUtils.split(storedRingMode, SEPARATOR);
@@ -215,8 +210,8 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
            mCheckBoxPrefs.clear();



            // get our list of buttons

            ArrayList<String> buttonList = PowerWidgetUtil.getButtonListFromString(PowerWidgetUtil

                    .getCurrentButtons(getActivity().getApplicationContext()));

            ArrayList<String> buttonList = PowerWidgetUtil.getButtonListFromString(

                    PowerWidgetUtil.getCurrentButtons(getActivity()));



            // Don't show WiMAX option if not supported

            boolean isWimaxEnabled = WimaxHelper.isWimaxSupported(getActivity());
@@ -235,8 +230,7 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
            // fill that checkbox map!

            for (PowerWidgetUtil.ButtonInfo button : PowerWidgetUtil.BUTTONS.values()) {

                // create a checkbox

                CheckBoxPreference cb = new CheckBoxPreference(getActivity()

                        .getApplicationContext());

                CheckBoxPreference cb = new CheckBoxPreference(getActivity());



                // set a dynamic key based on button id

                cb.setKey(SELECT_BUTTON_KEY_PREFIX + button.getId());
@@ -263,17 +257,16 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
                } else if (PowerWidgetUtil.BUTTON_NETWORKMODE.equals(button.getId())) {

                    // some phones run on networks not supported by this button,

                    // so disable it

                    int network_state = -99;

                    int networkState = -99;



                    try {

                        network_state = Settings.Global.getInt(getActivity()

                                .getApplicationContext().getContentResolver(),

                        networkState = Settings.Global.getInt(getContentResolver(),

                                Settings.Global.PREFERRED_NETWORK_MODE);

                    } catch (Settings.SettingNotFoundException e) {

                        Log.e(TAG, "Unable to retrieve PREFERRED_NETWORK_MODE", e);

                    }



                    switch (network_state) {

                    switch (networkState) {

                    // list of supported network modes

                        case Phone.NT_MODE_WCDMA_PREF:

                        case Phone.NT_MODE_WCDMA_ONLY:
@@ -309,11 +302,10 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 


            if (buttonWasModified) {

                // now we do some wizardry and reset the button list

                PowerWidgetUtil.saveCurrentButtons(getActivity().getApplicationContext(),

                PowerWidgetUtil.saveCurrentButtons(getActivity(),

                        PowerWidgetUtil.mergeInNewButtonString(

                                PowerWidgetUtil.getCurrentButtons(getActivity()

                                        .getApplicationContext()), PowerWidgetUtil

                                        .getButtonStringFromList(buttonList)));

                                PowerWidgetUtil.getCurrentButtons(getActivity()),

                                PowerWidgetUtil.getButtonStringFromList(buttonList)));

                return true;

            }
@@ -335,36 +327,34 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
        }



        public boolean onPreferenceChange(Preference preference, Object newValue) {

            ContentResolver resolver = getContentResolver();



            if (preference == mBrightnessMode) {

                ArrayList<String> arrValue = new ArrayList<String>((Set<String>) newValue);

                Collections.sort(arrValue, new MultiSelectListPreferenceComparator(mBrightnessMode));

                Settings.System.putString(getActivity().getApplicationContext().getContentResolver(),

                        Settings.System.EXPANDED_BRIGHTNESS_MODE, TextUtils.join(SEPARATOR, arrValue));

                updateSummary(TextUtils.join(SEPARATOR, arrValue),

                        mBrightnessMode, R.string.pref_brightness_mode_summary);

                String value = TextUtils.join(SEPARATOR, arrValue);

                Settings.System.putString(resolver, Settings.System.EXPANDED_BRIGHTNESS_MODE, value);

                updateSummary(value, mBrightnessMode, R.string.pref_brightness_mode_summary);

            } else if (preference == mNetworkMode) {

                int value = Integer.valueOf((String) newValue);

                int index = mNetworkMode.findIndexOfValue((String) newValue);

                Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),

                        Settings.System.EXPANDED_NETWORK_MODE, value);

                Settings.System.putInt(resolver, Settings.System.EXPANDED_NETWORK_MODE, value);

                mNetworkMode.setSummary(mNetworkMode.getEntries()[index]);

            } else if (preference == mScreenTimeoutMode) {

                int value = Integer.valueOf((String) newValue);

                int index = mScreenTimeoutMode.findIndexOfValue((String) newValue);

                Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),

                        Settings.System.EXPANDED_SCREENTIMEOUT_MODE, value);

                Settings.System.putInt(resolver, Settings.System.EXPANDED_SCREENTIMEOUT_MODE, value);

                mScreenTimeoutMode.setSummary(mScreenTimeoutMode.getEntries()[index]);

            } else if (preference == mRingMode) {

                ArrayList<String> arrValue = new ArrayList<String>((Set<String>) newValue);

                Collections.sort(arrValue, new MultiSelectListPreferenceComparator(mRingMode));

                Settings.System.putString(getActivity().getApplicationContext().getContentResolver(),

                        Settings.System.EXPANDED_RING_MODE, TextUtils.join(SEPARATOR, arrValue));

                updateSummary(TextUtils.join(SEPARATOR, arrValue), mRingMode, R.string.pref_ring_mode_summary);

                String value = TextUtils.join(SEPARATOR, arrValue);

                Settings.System.putString(resolver, Settings.System.EXPANDED_RING_MODE, value);

                updateSummary(value, mRingMode, R.string.pref_ring_mode_summary);

            } else if (preference == mFlashMode) {

                int value = Integer.valueOf((String) newValue);

                int index = mFlashMode.findIndexOfValue((String) newValue);

                Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),

                        Settings.System.EXPANDED_FLASH_MODE, value);

                Settings.System.putInt(resolver, Settings.System.EXPANDED_FLASH_MODE, value);

                mFlashMode.setSummary(mFlashMode.getEntries()[index]);

            }

            return true;
@@ -410,7 +400,6 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
        private ListView mButtonList;

        private ButtonAdapter mButtonAdapter;

        View mContentView = null;

        Context mContext;



        @Override

        public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -425,11 +414,10 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
        @Override

        public void onActivityCreated(Bundle savedInstanceState) {

            super.onActivityCreated(savedInstanceState);

            mContext = getActivity().getApplicationContext();



            mButtonList = getListView();

            ((TouchInterceptor) mButtonList).setDropListener(mDropListener);

            mButtonAdapter = new ButtonAdapter(mContext);

            mButtonAdapter = new ButtonAdapter(getActivity());

            setListAdapter(mButtonAdapter);

        }
@@ -450,9 +438,10 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 


        private TouchInterceptor.DropListener mDropListener = new TouchInterceptor.DropListener() {

            public void drop(int from, int to) {

                final Context context = getActivity();

                // get the current button list

                ArrayList<String> buttons = PowerWidgetUtil.getButtonListFromString(

                        PowerWidgetUtil.getCurrentButtons(mContext));

                        PowerWidgetUtil.getCurrentButtons(context));



                // move the button

                if (from < buttons.size()) {
@@ -462,7 +451,7 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements 
                        buttons.add(to, button);



                        // save our buttons

                        PowerWidgetUtil.saveCurrentButtons(mContext,

                        PowerWidgetUtil.saveCurrentButtons(context,

                                PowerWidgetUtil.getButtonStringFromList(buttons));



                        // tell our adapter/listview to reload

src/com/android/settings/cyanogenmod/QuickSettings.java

+6 −8
Original line number Diff line number Diff line
@@ -154,19 +154,18 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
    }



    public boolean onPreferenceChange(Preference preference, Object newValue) {

        ContentResolver resolver = getActivity().getContentResolver();

        ContentResolver resolver = getContentResolver();

        if (preference == mRingMode) {

            ArrayList<String> arrValue = new ArrayList<String>((Set<String>) newValue);

            Collections.sort(arrValue, new MultiSelectListPreferenceComparator(mRingMode));

            Settings.System.putString(resolver, Settings.System.EXPANDED_RING_MODE,

                    TextUtils.join(SEPARATOR, arrValue));

            updateSummary(TextUtils.join(SEPARATOR, arrValue), mRingMode, R.string.pref_ring_mode_summary);

            String value = TextUtils.join(SEPARATOR, arrValue);

            Settings.System.putString(resolver, Settings.System.EXPANDED_RING_MODE, value);

            updateSummary(value, mRingMode, R.string.pref_ring_mode_summary);

            return true;

        } else if (preference == mNetworkMode) {

            int value = Integer.valueOf((String) newValue);

            int index = mNetworkMode.findIndexOfValue((String) newValue);

            Settings.System.putInt(resolver,

                    Settings.System.EXPANDED_NETWORK_MODE, value);

            Settings.System.putInt(resolver, Settings.System.EXPANDED_NETWORK_MODE, value);

            mNetworkMode.setSummary(mNetworkMode.getEntries()[index]);

            return true;

        } else if (preference == mQuickPulldown) {
@@ -178,8 +177,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        } else if (preference == mScreenTimeoutMode) {

            int value = Integer.valueOf((String) newValue);

            int index = mScreenTimeoutMode.findIndexOfValue((String) newValue);

            Settings.System.putInt(getActivity().getApplicationContext().getContentResolver(),

                    Settings.System.EXPANDED_SCREENTIMEOUT_MODE, value);

            Settings.System.putInt(resolver, Settings.System.EXPANDED_SCREENTIMEOUT_MODE, value);

            mScreenTimeoutMode.setSummary(mScreenTimeoutMode.getEntries()[index]);

            return true;

        }