Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add status bar time for 5.1" into lmp-mr1-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2015-03-02 19:26:14 +00:00
committed by Android (Google) Code Review
parent 8243b74f7f 2045061aac
commit 07d453fa09
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
View File

@@ -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";
}