diff options
4 files changed, 5 insertions, 2 deletions
diff --git a/core/res/res/layout/date_picker_header_material.xml b/core/res/res/layout/date_picker_header_material.xml index a0e2b1de60d4..755317ee28ce 100644 --- a/core/res/res/layout/date_picker_header_material.xml +++ b/core/res/res/layout/date_picker_header_material.xml @@ -54,7 +54,7 @@ android:textAppearance="@style/TextAppearance.Material.DatePicker.DateLabel" android:includeFontPadding="false" android:gravity="start" - android:maxLines="2" + android:maxLines="@integer/date_picker_header_max_lines_material" android:ellipsize="none" /> </LinearLayout> </LinearLayout> diff --git a/core/res/res/values-land/integers.xml b/core/res/res/values-land/integers.xml index 020fd23cec81..a5789895c970 100644 --- a/core/res/res/values-land/integers.xml +++ b/core/res/res/values-land/integers.xml @@ -23,4 +23,6 @@ <integer name="kg_widget_region_weight">45</integer> <integer name="kg_security_flipper_weight">55</integer> <integer name="kg_glowpad_rotation_offset">-90</integer> + + <integer name="date_picker_header_max_lines_material">4</integer> </resources> diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index 8f8d59e95782..71ac2f49ff71 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -26,4 +26,5 @@ <integer name="date_picker_mode">1</integer> <integer name="time_picker_mode">1</integer> + <integer name="date_picker_header_max_lines_material">2</integer> </resources> diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java index a812cee746f0..2529564107b2 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java +++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java @@ -280,7 +280,7 @@ public class RetailDemoModeService extends SystemService { synchronized (mActivityLock) { sessionDuration = (int) ((mLastUserActivityTime - mFirstUserActivityTime) / 1000); } - MetricsLogger.count(getContext(), DEMO_SESSION_DURATION, sessionDuration); + MetricsLogger.histogram(getContext(), DEMO_SESSION_DURATION, sessionDuration); } private ActivityManagerService getActivityManager() { |