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

Revert "[Settings] Adjusting the control of display sequence (part 2)"

Browse Source 
This reverts commit 6b379cd7cf.

Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
This commit is contained in:
Chaohui Wang
2023-04-22 08:35:45 +08:00
parent 134bea1957
commit 52b723beef
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/datausage/ChartDataUsagePreference.java
View File

@@ -73,20 +73,21 @@ public class ChartDataUsagePreference extends Preference {
} }
private void onUpdateView() { private void onUpdateView() {
if ((mUsageView == null) || (mNetworkCycleChartData == null)) { UsageView chart = mUsageView;
if ((chart == null) || (mNetworkCycleChartData == null)) {
return; return;
} }
final int top = getTop(); final int top = getTop();
mUsageView.clearPaths(); chart.clearPaths();
mUsageView.configureGraph(toInt(mEnd - mStart), top); chart.configureGraph(toInt(mEnd - mStart), top);
calcPoints(mUsageView, mNetworkCycleChartData.getUsageBuckets()); calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());
setupContentDescription(mUsageView, mNetworkCycleChartData.getUsageBuckets()); setupContentDescription(chart, mNetworkCycleChartData.getUsageBuckets());
mUsageView.setBottomLabels(new CharSequence[] { chart.setBottomLabels(new CharSequence[] {
Utils.formatDateRange(getContext(), mStart, mStart), Utils.formatDateRange(getContext(), mStart, mStart),
Utils.formatDateRange(getContext(), mEnd, mEnd), Utils.formatDateRange(getContext(), mEnd, mEnd),
}); });
bindNetworkPolicy(mUsageView, mPolicy, top); bindNetworkPolicy(chart, mPolicy, top);
} }
public int getTop() { public int getTop() {

3
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -345,9 +345,6 @@ public class DataUsageList extends DataUsageBaseFragment
*/ */
@VisibleForTesting @VisibleForTesting
void updatePolicy() { void updatePolicy() {
if (mHeader == null) {
return;
}
final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate); final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate);
final View configureButton = mHeader.findViewById(R.id.filter_settings); final View configureButton = mHeader.findViewById(R.id.filter_settings);
//SUB SELECT //SUB SELECT