commit 4c74da90dba32e608e956cccb6c150db0540a78b
author Deepanshu Gupta <deepanshu@google.com> Mon Mar 02 22:45:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 02 22:45:57 2015 +0000
tree 8ae3cb35089edf05d2f79c785a8216d5eb6839a7
parent c1bce3de9014ef49869be45c915c8a844d19c64b
parent c74295db3048d964679913f146511ce3ad838089

am c74295db: am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev

* commit 'c74295db3048d964679913f146511ce3ad838089':
  Add status bar time for 5.1

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
index 82a5130..dde041b 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
@@ -73,7 +73,7 @@
 
     public static String getTime(int platformVersion) {
         if (platformVersion == 0) {
-            return "5:00";
+            return "5:10";
         }
         if (platformVersion < GINGERBREAD) {
             return "2:20";
@@ -87,9 +87,12 @@
         if (platformVersion < KITKAT) {
             return "4:30";
         }
-        if (platformVersion <= KITKAT_WATCH) {
+        if (platformVersion < LOLLIPOP) {
             return "4:40";
         }
+        if (platformVersion < LOLLIPOP_MR1) {
+            return "5:00";
+        }
         // Should never happen.
         return "4:04";
     }