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

Commit 94a9095e authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Read network policy earlier, fix ugly scrollbar. 

Read policy before creating options menu, so we correctly populate
checkboxes.  Also clean up Preference views so we don't crash when
returning from app details.

Change-Id: I52c38a3016ea669e27b325bfb6ae1620d2a5ca53
parent 00046d6e

res/layout/data_usage_summary.xml

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ 
            android:id="@android:id/list"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1" />

            android:layout_weight="1"

            android:smoothScrollbar="false" />



    </LinearLayout>

src/com/android/settings/DataUsageSummary.java

+9 −3
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ public class DataUsageSummary extends Fragment { 
        final Context context = getActivity();

        final String subscriberId = getActiveSubscriberId(context);

        mPolicyModifier = new NetworkPolicyModifier(mPolicyService, subscriberId);

        mPolicyModifier.read();



        setHasOptionsMenu(true);

    }
@@ -194,9 +195,6 @@ public class DataUsageSummary extends Fragment { 
    public void onResume() {

        super.onResume();



        // read current policy state from service

        mPolicyModifier.read();



        // this kicks off chain reaction which creates tabs, binds the body to

        // selected network, and binds chart, cycles and detail list.

        updateTabs();
@@ -233,6 +231,14 @@ public class DataUsageSummary extends Fragment { 
        return false;

    }



    @Override

    public void onDestroyView() {

        super.onDestroyView();



        mDataEnabledView = null;

        mDisableAtLimitView = null;

    }



    /**

     * Rebuild all tabs based on {@link NetworkPolicyModifier} and

     * {@link #mShowWifi}, hiding the tabs entirely when applicable. Selects