Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix partically truncated problem for bar chart"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-12 13:18:33 +00:00
committed by Android (Google) Code Review
parent b94548e5eb ee7657f12d
commit 8bf530ae17
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml
View File

@@ -66,7 +66,7 @@
android:id="@+id/bar_chart_details"
style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:gravity="center"/>
</LinearLayout>

2
packages/SettingsLib/BarChartPreference/res/values/styles.xml
View File

@@ -18,7 +18,7 @@
<resources>
<style name="BarViewStyle">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">226dp</item>
<item name="android:layout_height">250dp</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_marginStart">8dp</item>
<item name="android:layout_marginEnd">8dp</item>

10
packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartPreference.java
View File

@@ -158,6 +158,11 @@ public class BarChartPreference extends Preference {
holder.setDividerAllowedAbove(true);
holder.setDividerAllowedBelow(true);
// We bind title and details early so that we can preserve the correct height for chart
// view.
bindChartTitleView(holder);
bindChartDetailsView(holder);
// If the state is loading, we just show a blank view.
if (mIsLoading) {
holder.itemView.setVisibility(View.INVISIBLE);
@@ -165,9 +170,6 @@ public class BarChartPreference extends Preference {
}
holder.itemView.setVisibility(View.VISIBLE);
// We must show title of bar chart.
bindChartTitleView(holder);
final BarViewInfo[] barViewInfos = mBarChartInfo.getBarViewInfos();
// If there is no any bar view, we just show an empty text.
if (barViewInfos == null || barViewInfos.length == 0) {
@@ -175,8 +177,6 @@ public class BarChartPreference extends Preference {
return;
}
setEmptyViewVisible(holder, false /* visible */);
bindChartDetailsView(holder);
updateBarChart(holder);
}