PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide usage graph on app usage details pages." into mnc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2015-07-28 20:32:05 +00:00
committed by Android (Google) Code Review
parent 5458688c1a 1740ce4f0c
commit feeae4cdeb
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/DataUsageSummary.java
View File

@@ -485,7 +485,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
// a header at the top. // a header at the top.
FrameLayout pinnedHeader = (FrameLayout) rootView.findViewById(R.id.pinned_header); FrameLayout pinnedHeader = (FrameLayout) rootView.findViewById(R.id.pinned_header);
AppHeader.createAppHeader(getActivity(), detail.icon, detail.label, null, pinnedHeader); AppHeader.createAppHeader(getActivity(), detail.icon, detail.label, null, pinnedHeader);
AppDetailsFragment.show(DataUsageSummary.this, app, detail.label, false); AppDetailsFragment.show(DataUsageSummary.this, app, detail.label, true);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.w(TAG, "Could not find " + mShowAppImmediatePkg, e); Log.w(TAG, "Could not find " + mShowAppImmediatePkg, e);
Toast.makeText(getActivity(), getString(R.string.unknown_app), Toast.LENGTH_LONG) Toast.makeText(getActivity(), getString(R.string.unknown_app), Toast.LENGTH_LONG)
@@ -936,9 +936,11 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
if (isAppDetailMode()) { if (isAppDetailMode()) {
mAppDetail.setVisibility(View.VISIBLE); mAppDetail.setVisibility(View.VISIBLE);
mCycleAdapter.setChangeVisible(false); mCycleAdapter.setChangeVisible(false);
mChart.setVisibility(View.GONE);
} else { } else {
mAppDetail.setVisibility(View.GONE); mAppDetail.setVisibility(View.GONE);
mCycleAdapter.setChangeVisible(true); mCycleAdapter.setChangeVisible(true);
mChart.setVisibility(View.VISIBLE);
// hide detail stats when not in detail mode // hide detail stats when not in detail mode
mChart.bindDetailNetworkStats(null); mChart.bindDetailNetworkStats(null);
@@ -1998,6 +2000,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
target.mCurrentApp = null; target.mCurrentApp = null;
target.updateBody(); target.updateBody();
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
getFragmentManager().popBackStack();
return true;
}
return super.onOptionsItemSelected(item);
}
} }
/** /**