commit 66204a42cbc185a225d04a4cc696c44516d6cceb
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 06 21:17:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 06 21:17:48 2017 +0000
tree af85cbc410f33b0de7b91eedce4e06df46318937
parent 018d1e066ec0115a95393bef17fdcbf9cbb1ff98
parent f72545a25c6e8b0e9cdeb1b3c266e954a49a9ebe

Merge "Update demo mode clock to 8:00 for O." into oc-mr1-dev

packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java

diff --git a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java
index 7c98e13..b3c86c6 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java
@@ -154,7 +154,15 @@
         getContext().sendBroadcast(intent);
 
         intent.putExtra(DemoMode.EXTRA_COMMAND, DemoMode.COMMAND_CLOCK);
-        intent.putExtra("hhmm", "0700");
+
+        String demoTime = "1010"; // 10:10, a classic choice of horologists
+        try {
+            String[] versionParts = android.os.Build.VERSION.RELEASE.split("\\.");
+            int majorVersion = Integer.valueOf(versionParts[0]);
+            demoTime = String.format("%02d00", majorVersion % 24);
+        } catch (IllegalArgumentException ex) {
+        }
+        intent.putExtra("hhmm", demoTime);
         getContext().sendBroadcast(intent);
 
         intent.putExtra(DemoMode.EXTRA_COMMAND, DemoMode.COMMAND_NETWORK);