Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "[LockSettings] migrate password attempt throttling to hardware" into m... | Andres Morales | 2015-05-27 | 8 | -44/+426 |
|\ | |||||
| * | [LockSettings] migrate password attempt throttling to hardware | Andres Morales | 2015-05-26 | 8 | -44/+426 |
* | | Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev | Alan Viverette | 2015-05-27 | 2 | -27/+61 |
|\ \ | |||||
| * | | Avoid strict mode violation during saveAttributeData | Alan Viverette | 2015-05-18 | 2 | -27/+61 |
* | | | Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-dev | Cedric Ho | 2015-05-27 | 1 | -6/+20 |
|\ \ \ | |||||
| * | | | Add getCallingUid() to RecognitionService.Callback. | Cedric Ho | 2015-05-27 | 1 | -6/+20 |
* | | | | Merge "Add workaround for measuring stacked button bar layout" into mnc-dev | Alan Viverette | 2015-05-27 | 2 | -13/+28 |
|\ \ \ \ | |||||
| * | | | | Add workaround for measuring stacked button bar layout | Alan Viverette | 2015-05-27 | 2 | -13/+28 |
* | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-05-27 | 24 | -48/+24 |
|/ / / / | |||||
* | | | | Merge "Update cached child enabled state before selector state" into mnc-dev | Alan Viverette | 2015-05-26 | 1 | -9/+7 |
|\ \ \ \ | |||||
| * | | | | Update cached child enabled state before selector state | Alan Viverette | 2015-05-18 | 1 | -9/+7 |
| | |/ / | |/| | | |||||
* | | | | Offset accessibility focus rect for view root's scrollY | Alan Viverette | 2015-05-26 | 1 | -0/+2 |
* | | | | Merge "Honor password visible setting in CryptKeeper" into mnc-dev | Paul Lawrence | 2015-05-26 | 2 | -0/+25 |
|\ \ \ \ | |||||
| * | | | | Honor password visible setting in CryptKeeper | Paul Lawrence | 2015-05-18 | 2 | -0/+25 |
| |/ / / | |||||
* | | | | Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-dev | Abodunrinwa Toki | 2015-05-26 | 1 | -5/+1 |
|\ \ \ \ | |||||
| * | | | | Hide the floatingtoolbar when content rect is invisible. | Abodunrinwa Toki | 2015-05-26 | 1 | -5/+1 |
* | | | | | Merge "Round rect clipping for notification contents" into mnc-dev | Jorim Jaggi | 2015-05-26 | 8 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Round rect clipping for notification contents | Jorim Jaggi | 2015-05-26 | 8 | -0/+8 |
* | | | | | | Merge "Add fingerprint icon" into mnc-dev | Jorim Jaggi | 2015-05-26 | 10 | -0/+71 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Add fingerprint icon | Jorim Jaggi | 2015-05-26 | 10 | -0/+71 |
* | | | | | | Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev | Nicolas Prevot | 2015-05-26 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Say in the doc that DISALLOW_CONFIG_VPN now works. | Nicolas Prevot | 2015-05-22 | 1 | -1/+2 |
* | | | | | | | Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." int... | John Spurlock | 2015-05-26 | 1 | -1/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Zen: Calendar auto-rule tracks primary calendar for corp profile. | John Spurlock | 2015-05-26 | 1 | -1/+13 |
* | | | | | | | | Merge "Switch runtime permission icons to vectors" into mnc-dev | Jason Monk | 2015-05-26 | 42 | -0/+168 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Switch runtime permission icons to vectors | Jason Monk | 2015-05-26 | 42 | -0/+168 |
* | | | | | | | | | Merge "Support icons in the FloatingToolbar" into mnc-dev | Abodunrinwa Toki | 2015-05-26 | 5 | -5/+142 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Support icons in the FloatingToolbar | Abodunrinwa Toki | 2015-05-26 | 5 | -5/+142 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Add javadoc comments mentioning ConnectivityManager API permissions." ... | Paul Jensen | 2015-05-26 | 1 | -70/+70 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add javadoc comments mentioning ConnectivityManager API permissions. | Paul Jensen | 2015-05-19 | 1 | -70/+70 |
* | | | | | | | | | Merge "Handle error states when refreshing accessibility node" into mnc-dev | Alan Viverette | 2015-05-26 | 1 | -9/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Handle error states when refreshing accessibility node | Alan Viverette | 2015-05-19 | 1 | -9/+25 |
* | | | | | | | | | | Merge "Ringtone picker is not affected by current sonification policy" into m... | Jean-Michel Trivi | 2015-05-26 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Ringtone picker is not affected by current sonification policy | Jean-Michel Trivi | 2015-05-21 | 1 | -0/+3 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Clarify example for Deep Share" into mnc-dev | Chet Haase | 2015-05-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Clarify example for Deep Share | Chet Haase | 2015-05-25 | 1 | -2/+2 |
* | | | | | | | | | | Merge "Add constants for permissions granted status api" into mnc-dev | Jason Monk | 2015-05-26 | 1 | -0/+36 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add constants for permissions granted status api | Jason Monk | 2015-05-26 | 1 | -0/+36 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Set error code on failed keyset manifest parsing." into mnc-dev | dcashman | 2015-05-26 | 1 | -14/+21 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Set error code on failed keyset manifest parsing. | dcashman | 2015-05-22 | 1 | -14/+21 |
* | | | | | | | | | Merge "Don't count lowmem mappings as memory used." into mnc-dev | Martijn Coenen | 2015-05-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't count lowmem mappings as memory used. | Martijn Coenen | 2015-05-22 | 1 | -2/+2 |
* | | | | | | | | | | Merge "Fixed logspam and handling subwindows with the input consumer" into mn... | Selim Cinek | 2015-05-26 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fixed logspam and handling subwindows with the input consumer | Selim Cinek | 2015-05-23 | 1 | -4/+11 |
* | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-05-25 | 76 | -90/+112 |
* | | | | | | | | | | Merge "Hide pakcage installer system APIs." into mnc-dev | Svet Ganov | 2015-05-23 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Hide pakcage installer system APIs. | Svet Ganov | 2015-05-23 | 1 | -4/+1 |
* | | | | | | | | | | Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc... | Dianne Hackborn | 2015-05-23 | 13 | -113/+61 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Revert "resolved conflicts for merge of 47249f2a to mnc-dev" | Dianne Hackborn | 2015-05-22 | 13 | -113/+61 |
* | | | | | | | | | | | Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into ... | Simranjit Singh Kohli | 2015-05-23 | 2 | -26/+32 |
|\ \ \ \ \ \ \ \ \ \ \ |