Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 3ce4f3d0 to master | Elliott Hughes | 2014-04-28 | 1 | -6/+6 |
|\ | |||||
| * | am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." | Elliott Hughes | 2014-04-28 | 1 | -6/+6 |
| |\ | |||||
| | * | Track libcore.os' move to android.system. | Elliott Hughes | 2014-04-28 | 1 | -6/+6 |
* | | | Merge "Attemp to fix blank lockscreen #2." | Jorim Jaggi | 2014-04-28 | 2 | -5/+6 |
|\ \ \ | |||||
| * | | | Attemp to fix blank lockscreen #2. | Jorim Jaggi | 2014-04-28 | 2 | -5/+6 |
* | | | | Merge "Flatten notification hiearchy and remove glow." | Jorim Jaggi | 2014-04-28 | 16 | -291/+100 |
|\ \ \ \ | |||||
| * | | | | Flatten notification hiearchy and remove glow. | Jorim Jaggi | 2014-04-28 | 16 | -291/+100 |
| |/ / / | |||||
* | | | | Merge "Fixed race condition regarding first child max height" | Selim Cinek | 2014-04-28 | 1 | -3/+7 |
|\ \ \ \ | |||||
| * | | | | Fixed race condition regarding first child max height | Selim Cinek | 2014-04-28 | 1 | -3/+7 |
* | | | | | Merge "Remove chatty log message." | Dan Sandler | 2014-04-28 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Remove chatty log message. | Dan Sandler | 2014-04-24 | 1 | -2/+3 |
* | | | | | | Merge "Add carrier text on lockscreen in top left corner." | Jorim Jaggi | 2014-04-28 | 5 | -3/+32 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add carrier text on lockscreen in top left corner. | Jorim Jaggi | 2014-04-25 | 5 | -3/+32 |
* | | | | | | Wire up condition providers to zen mode exit triggers. | John Spurlock | 2014-04-27 | 2 | -3/+62 |
* | | | | | | am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to... | Wink Saville | 2014-04-26 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC I... | Wink Saville | 2014-04-26 | 1 | -0/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge "Telephony: Add functionality to handle ICC IO error" | Wink Saville | 2014-04-25 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Telephony: Add functionality to handle ICC IO error | Rakesh Pallerla | 2014-03-12 | 1 | -0/+3 |
* | | | | | | | Merge "Add new DevicePolicyManager disable flags for keyguard." | Jim Miller | 2014-04-26 | 1 | -1/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add new DevicePolicyManager disable flags for keyguard. | Jim Miller | 2014-04-25 | 1 | -1/+22 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge "Delay settings panel visibility until touch slop exceeded." | John Spurlock | 2014-04-25 | 1 | -10/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Delay settings panel visibility until touch slop exceeded. | John Spurlock | 2014-04-25 | 1 | -10/+17 |
| |/ / / / / / | |||||
* | | | | | | | Merge "Fixed shell manifest to use correct permission." | Allen Hair | 2014-04-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed shell manifest to use correct permission. | Allen Hair | 2014-04-23 | 1 | -1/+1 |
* | | | | | | | | Merge "Attempt to fix blank lockscreen." | Jorim Jaggi | 2014-04-25 | 1 | -6/+14 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Attempt to fix blank lockscreen. | Jorim Jaggi | 2014-04-25 | 1 | -6/+14 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | resolved conflicts for merge of 02e85744 to master | Elliott Hughes | 2014-04-24 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libc... | Elliott Hughes | 2014-04-24 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Use the suggested public API instead of libcore.os. | Elliott Hughes | 2014-04-24 | 1 | -2/+1 |
| * | | | | | | am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JN... | Ying Wang | 2014-04-21 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. | Ying Wang | 2014-04-18 | 2 | -2/+2 |
* | | | | | | | Merge "Enabling doc centric recents on phones." | Winson Chung | 2014-04-24 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Enabling doc centric recents on phones. | Winson Chung | 2014-04-21 | 1 | -1/+2 |
* | | | | | | | Merge "Add text view for double-tap and unlock hint on Keyguard." | Jorim Jaggi | 2014-04-24 | 5 | -1/+118 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add text view for double-tap and unlock hint on Keyguard. | Jorim Jaggi | 2014-04-24 | 5 | -1/+118 |
* | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-23 | 1 | -1/+1 |
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-04-24 | 55 | -0/+110 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-23 | 55 | -0/+110 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-23 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-04-24 | 56 | -8/+150 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-23 | 56 | -8/+150 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260... | Winson Chung | 2014-04-24 | 3 | -15/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718) | Winson Chung | 2014-04-23 | 3 | -15/+27 |
* | | | | | | | | | Don't show managed profiles in the user switcher | Amith Yamasani | 2014-04-23 | 1 | -1/+7 |
* | | | | | | | | | Avoid panel "flip" animations when possible. | John Spurlock | 2014-04-23 | 1 | -83/+114 |
* | | | | | | | | | Merge "Quick settings: interim tile shuffle." | John Spurlock | 2014-04-23 | 1 | -72/+73 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Quick settings: interim tile shuffle. | John Spurlock | 2014-04-23 | 1 | -72/+73 |
* | | | | | | | | | Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." | Jorim Jaggi | 2014-04-23 | 4 | -65/+43 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | |