summaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 3ce4f3d0 to masterElliott Hughes2014-04-281-6/+6
|\
| * am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system."Elliott Hughes2014-04-281-6/+6
| |\
| | * Track libcore.os' move to android.system.Elliott Hughes2014-04-281-6/+6
* | | Merge "Attemp to fix blank lockscreen #2."Jorim Jaggi2014-04-282-5/+6
|\ \ \
| * | | Attemp to fix blank lockscreen #2.Jorim Jaggi2014-04-282-5/+6
* | | | Merge "Flatten notification hiearchy and remove glow."Jorim Jaggi2014-04-2816-291/+100
|\ \ \ \
| * | | | Flatten notification hiearchy and remove glow.Jorim Jaggi2014-04-2816-291/+100
| |/ / /
* | | | Merge "Fixed race condition regarding first child max height"Selim Cinek2014-04-281-3/+7
|\ \ \ \
| * | | | Fixed race condition regarding first child max heightSelim Cinek2014-04-281-3/+7
* | | | | Merge "Remove chatty log message."Dan Sandler2014-04-281-2/+3
|\ \ \ \ \
| * | | | | Remove chatty log message.Dan Sandler2014-04-241-2/+3
* | | | | | Merge "Add carrier text on lockscreen in top left corner."Jorim Jaggi2014-04-285-3/+32
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add carrier text on lockscreen in top left corner.Jorim Jaggi2014-04-255-3/+32
* | | | | | Wire up condition providers to zen mode exit triggers.John Spurlock2014-04-272-3/+62
* | | | | | am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to...Wink Saville2014-04-261-0/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC I...Wink Saville2014-04-261-0/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Telephony: Add functionality to handle ICC IO error"Wink Saville2014-04-251-0/+3
| | |\ \ \ \
| | | * | | | Telephony: Add functionality to handle ICC IO errorRakesh Pallerla2014-03-121-0/+3
* | | | | | | Merge "Add new DevicePolicyManager disable flags for keyguard."Jim Miller2014-04-261-1/+22
|\ \ \ \ \ \ \
| * | | | | | | Add new DevicePolicyManager disable flags for keyguard.Jim Miller2014-04-251-1/+22
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Delay settings panel visibility until touch slop exceeded."John Spurlock2014-04-251-10/+17
|\ \ \ \ \ \ \
| * | | | | | | Delay settings panel visibility until touch slop exceeded.John Spurlock2014-04-251-10/+17
| |/ / / / / /
* | | | | | | Merge "Fixed shell manifest to use correct permission."Allen Hair2014-04-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed shell manifest to use correct permission.Allen Hair2014-04-231-1/+1
* | | | | | | | Merge "Attempt to fix blank lockscreen."Jorim Jaggi2014-04-251-6/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Attempt to fix blank lockscreen.Jorim Jaggi2014-04-251-6/+14
| | |/ / / / / | |/| | | | |
* | | | | | | resolved conflicts for merge of 02e85744 to masterElliott Hughes2014-04-241-2/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libc...Elliott Hughes2014-04-241-2/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Use the suggested public API instead of libcore.os.Elliott Hughes2014-04-241-2/+1
| * | | | | | am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JN...Ying Wang2014-04-212-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.Ying Wang2014-04-182-2/+2
* | | | | | | Merge "Enabling doc centric recents on phones."Winson Chung2014-04-241-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Enabling doc centric recents on phones.Winson Chung2014-04-211-1/+2
* | | | | | | Merge "Add text view for double-tap and unlock hint on Keyguard."Jorim Jaggi2014-04-245-1/+118
|\ \ \ \ \ \ \
| * | | | | | | Add text view for double-tap and unlock hint on Keyguard.Jorim Jaggi2014-04-245-1/+118
* | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-231-1/+1
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-2455-0/+110
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2355-0/+110
| |/ / / / / / / /
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-241-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-231-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-2456-8/+150
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2356-8/+150
| |/ / / / / / /
* | | | | | | | Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260...Winson Chung2014-04-243-15/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)Winson Chung2014-04-233-15/+27
* | | | | | | | | Don't show managed profiles in the user switcherAmith Yamasani2014-04-231-1/+7
* | | | | | | | | Avoid panel "flip" animations when possible.John Spurlock2014-04-231-83/+114
* | | | | | | | | Merge "Quick settings: interim tile shuffle."John Spurlock2014-04-231-72/+73
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Quick settings: interim tile shuffle.John Spurlock2014-04-231-72/+73
* | | | | | | | | Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."Jorim Jaggi2014-04-234-65/+43
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |