summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "[LockSettings] migrate password attempt throttling to hardware" into m...Andres Morales2015-05-278-44/+426
|\
| * [LockSettings] migrate password attempt throttling to hardwareAndres Morales2015-05-268-44/+426
* | Merge "Avoid strict mode violation during saveAttributeData" into mnc-devAlan Viverette2015-05-272-27/+61
|\ \
| * | Avoid strict mode violation during saveAttributeDataAlan Viverette2015-05-182-27/+61
* | | Merge "Add getCallingUid() to RecognitionService.Callback." into mnc-devCedric Ho2015-05-271-6/+20
|\ \ \
| * | | Add getCallingUid() to RecognitionService.Callback.Cedric Ho2015-05-271-6/+20
* | | | Merge "Add workaround for measuring stacked button bar layout" into mnc-devAlan Viverette2015-05-272-13/+28
|\ \ \ \
| * | | | Add workaround for measuring stacked button bar layoutAlan Viverette2015-05-272-13/+28
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-2724-48/+24
|/ / / /
* | | | Merge "Update cached child enabled state before selector state" into mnc-devAlan Viverette2015-05-261-9/+7
|\ \ \ \
| * | | | Update cached child enabled state before selector stateAlan Viverette2015-05-181-9/+7
| | |/ / | |/| |
* | | | Offset accessibility focus rect for view root's scrollYAlan Viverette2015-05-261-0/+2
* | | | Merge "Honor password visible setting in CryptKeeper" into mnc-devPaul Lawrence2015-05-262-0/+25
|\ \ \ \
| * | | | Honor password visible setting in CryptKeeperPaul Lawrence2015-05-182-0/+25
| |/ / /
* | | | Merge "Hide the floatingtoolbar when content rect is invisible." into mnc-devAbodunrinwa Toki2015-05-261-5/+1
|\ \ \ \
| * | | | Hide the floatingtoolbar when content rect is invisible.Abodunrinwa Toki2015-05-261-5/+1
* | | | | Merge "Round rect clipping for notification contents" into mnc-devJorim Jaggi2015-05-268-0/+8
|\ \ \ \ \
| * | | | | Round rect clipping for notification contentsJorim Jaggi2015-05-268-0/+8
* | | | | | Merge "Add fingerprint icon" into mnc-devJorim Jaggi2015-05-2610-0/+71
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add fingerprint iconJorim Jaggi2015-05-2610-0/+71
* | | | | | Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-devNicolas Prevot2015-05-261-1/+2
|\ \ \ \ \ \
| * | | | | | Say in the doc that DISALLOW_CONFIG_VPN now works.Nicolas Prevot2015-05-221-1/+2
* | | | | | | Merge "Zen: Calendar auto-rule tracks primary calendar for corp profile." int...John Spurlock2015-05-261-1/+13
|\ \ \ \ \ \ \
| * | | | | | | Zen: Calendar auto-rule tracks primary calendar for corp profile.John Spurlock2015-05-261-1/+13
* | | | | | | | Merge "Switch runtime permission icons to vectors" into mnc-devJason Monk2015-05-2642-0/+168
|\ \ \ \ \ \ \ \
| * | | | | | | | Switch runtime permission icons to vectorsJason Monk2015-05-2642-0/+168
* | | | | | | | | Merge "Support icons in the FloatingToolbar" into mnc-devAbodunrinwa Toki2015-05-265-5/+142
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Support icons in the FloatingToolbarAbodunrinwa Toki2015-05-265-5/+142
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Add javadoc comments mentioning ConnectivityManager API permissions." ...Paul Jensen2015-05-261-70/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | Add javadoc comments mentioning ConnectivityManager API permissions.Paul Jensen2015-05-191-70/+70
* | | | | | | | | Merge "Handle error states when refreshing accessibility node" into mnc-devAlan Viverette2015-05-261-9/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle error states when refreshing accessibility nodeAlan Viverette2015-05-191-9/+25
* | | | | | | | | | Merge "Ringtone picker is not affected by current sonification policy" into m...Jean-Michel Trivi2015-05-261-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ringtone picker is not affected by current sonification policyJean-Michel Trivi2015-05-211-0/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Clarify example for Deep Share" into mnc-devChet Haase2015-05-261-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Clarify example for Deep ShareChet Haase2015-05-251-2/+2
* | | | | | | | | | Merge "Add constants for permissions granted status api" into mnc-devJason Monk2015-05-261-0/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Add constants for permissions granted status apiJason Monk2015-05-261-0/+36
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge "Set error code on failed keyset manifest parsing." into mnc-devdcashman2015-05-261-14/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Set error code on failed keyset manifest parsing.dcashman2015-05-221-14/+21
* | | | | | | | | Merge "Don't count lowmem mappings as memory used." into mnc-devMartijn Coenen2015-05-261-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't count lowmem mappings as memory used.Martijn Coenen2015-05-221-2/+2
* | | | | | | | | | Merge "Fixed logspam and handling subwindows with the input consumer" into mn...Selim Cinek2015-05-261-4/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Fixed logspam and handling subwindows with the input consumerSelim Cinek2015-05-231-4/+11
* | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-2576-90/+112
* | | | | | | | | | Merge "Hide pakcage installer system APIs." into mnc-devSvet Ganov2015-05-231-4/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Hide pakcage installer system APIs.Svet Ganov2015-05-231-4/+1
* | | | | | | | | | Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc...Dianne Hackborn2015-05-2313-113/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "resolved conflicts for merge of 47249f2a to mnc-dev"Dianne Hackborn2015-05-2213-113/+61
* | | | | | | | | | | Merge "[ChooseAccount/AccountManager.newChooseAccountIntent Bug Fixes]" into ...Simranjit Singh Kohli2015-05-232-26/+32
|\ \ \ \ \ \ \ \ \ \ \