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

Commit 41b761ad authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Clean up CellDataPreference dialog problems"

parents 0c7bce82 d0682d03

src/com/android/settings/CustomDialogPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ public class CustomDialogPreference extends DialogPreference { 


    private CustomPreferenceDialogFragment mFragment;



    public CustomDialogPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

    public CustomDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

    }

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

+5 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa 


    private static final String TAG = "CellDataPreference";



    public int mSubId;

    public int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    public boolean mChecked;

    public boolean mMultiSimDialog;

    private TelephonyManager mTelephonyManager;
@@ -65,8 +65,10 @@ public class CellDataPreference extends CustomDialogPreference implements Templa 
        mTelephonyManager = TelephonyManager.from(getContext());

        mChecked = state.mChecked;

        mMultiSimDialog = state.mMultiSimDialog;

        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            mSubId = state.mSubId;

            setKey(getKey() + mSubId);

        }

        notifyChanged();

    }
@@ -110,7 +112,6 @@ public class CellDataPreference extends CustomDialogPreference implements Templa 


    @Override

    protected void performClick(View view) {

        super.performClick(view);

        MetricsLogger.action(getContext(), MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);

        if (mChecked) {

            // disabling data; show confirmation dialog which eventually

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

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable { 
        TemplatePreferenceCategory category = (TemplatePreferenceCategory)

                inflatePreferences(R.xml.data_usage_cellular);

        category.setTemplate(getNetworkTemplate(subId), subId, services);

        category.pushTemplates(services);

    }



    private void addWifiSection() {