diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-02 19:41:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 19:41:59 +0000 |
| commit | 7b4caab1a87b659498d30af194ae511526c503ba (patch) | |
| tree | 96181fa87e1353b6868fec1328b97d18b7f3ec14 /tools | |
| parent | 4725bec1ff03d8be859c52dba6ac663016c2295c (diff) | |
| parent | 07d453fa091ab407864d474f9bf2a5167686010a (diff) | |
| download | frameworks_base-7b4caab1a87b659498d30af194ae511526c503ba.zip frameworks_base-7b4caab1a87b659498d30af194ae511526c503ba.tar.gz frameworks_base-7b4caab1a87b659498d30af194ae511526c503ba.tar.bz2 | |
am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
* commit '07d453fa091ab407864d474f9bf2a5167686010a':
Add status bar time for 5.1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 class Config { 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 @@ public class Config { 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"; } |