diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-02 19:53:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 19:53:32 +0000 |
| commit | c74295db3048d964679913f146511ce3ad838089 (patch) | |
| tree | 2a716b880c1173e79ad5b770872742433ed5e615 /tools | |
| parent | ad87503ed083245c9ccf51cee0f88aecd3531bb4 (diff) | |
| parent | bf815f495270b466e53bec20772b41ff4397ac83 (diff) | |
| download | frameworks_base-c74295db3048d964679913f146511ce3ad838089.zip frameworks_base-c74295db3048d964679913f146511ce3ad838089.tar.gz frameworks_base-c74295db3048d964679913f146511ce3ad838089.tar.bz2 | |
am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
* commit 'bf815f495270b466e53bec20772b41ff4397ac83':
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"; } |