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

Commit 4873d0e8 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Code refactor"

parents 1f0d5040 90cb45e3

src/com/android/settings/datausage/BillingCyclePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class BillingCyclePreference extends Preference 
    }



    /**

     * Implementation of MobileDataEnabledListener.Client

     * Implementation of {@code MobileDataEnabledListener.Client}

     */

    public void onMobileDataEnabledChange() {

        updateEnabled();

src/com/android/settings/datausage/CellDataPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ public class CellDataPreference extends CustomDialogPreferenceCompat 
            };



    /**

     * Implementation of MobileDataEnabledListener.Client

     * Implementation of {@code MobileDataEnabledListener.Client}

    */

    @VisibleForTesting

    public void onMobileDataEnabledChange() {

src/com/android/settings/datausage/DataUsageList.java

+1 −2
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ public class DataUsageList extends DataUsageBaseFragment 
    public void onDestroy() {

        mUidDetailProvider.clearCache();

        mUidDetailProvider = null;

        mDataStateListener.stop();



        super.onDestroy();

    }
@@ -232,7 +231,7 @@ public class DataUsageList extends DataUsageBaseFragment 
    }



    /**

     * Implementation of MobileDataEnabledListener.Client

     * Implementation of {@code MobileDataEnabledListener.Client}

     */

    public void onMobileDataEnabledChange() {

        updatePolicy();

src/com/android/settings/datausage/DataUsageSummary.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage 
        super.onCreate(icicle);

        Context context = getContext();



        // enable ProxySubscriptionMgr with Lifecycle support for all controllers

        // Enable ProxySubscriptionMgr with Lifecycle support for all controllers

        // live within this fragment

        mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(context);

        mProxySubscriptionMgr.setLifecycle(getLifecycle());

src/com/android/settings/network/MobileDataEnabledListener.java

+6 −6
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ public class MobileDataEnabledListener { 
    private Context mContext;

    private Client mClient;

    private int mSubId;

    /**

     * There're 2 listeners both activated at the same time.

     * For project that access MOBILE_DATA, only first listener is functional.

     * For project that access "MOBILE_DATA + subId", first listener will be stopped when receiving

     * any onChange from second listener.

     */



    // There're 2 listeners both activated at the same time.

    // For project that access MOBILE_DATA, only first listener is functional.

    // For project that access "MOBILE_DATA + subId", first listener will be stopped when receiving

    // any onChange from second listener.



    private GlobalSettingsChangeListener mListener;

    private GlobalSettingsChangeListener mListenerForSubId;