summaryrefslogtreecommitdiffstats
path: root/core/java/com/android
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | am c07701f2: am 3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" i...Ajay Panicker2015-08-271-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a07177f0: Merge "Launching the camera now from systemUI including animatio...Selim Cinek2015-08-261-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d56892da: Merge "Disable fingerprint after user lockout" into mnc-dr-devAdrian Roos2015-08-261-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b5e47228: Add StrongAuthTrackerAdrian Roos2015-08-222-7/+181
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c op...Dianne Hackborn2015-08-191-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 877c2257: Merge "instrument fingerprint service" into mnc-dr-devChris Wren2015-08-171-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-devDan Sandler2015-08-161-3/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permiss...Svetoslav Ganov2015-08-141-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c98a786c: am beabcb92: Merge "Fix Insertion ActionMode not showing on RTL ...Raph Levien2015-08-121-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape"...Adrian Roos2015-08-121-10/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Make sure that changes to UI in SwipeDismissLayout are on UI thread." ...Bryce Lee2015-08-071-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that changes to UI in SwipeDismissLayout are on UI thread.Bryce Lee2015-08-071-6/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[2/2] framework/base: Add EdgeGesture service."Steve Kondik2016-03-102-124/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base: dock batteryJorge Ruesga2016-03-104-11/+178
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Themes: Refactor themes to CMSDK [1/6]d34d2016-03-041-332/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemUI: handle camera launch gesture from keyhadlerRoman Birg2016-02-181-17/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework: Log applied theme when apps crashd34d2016-02-161-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyHandler: don't break old interfacesRoman Birg2016-02-141-0/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework: move device key handler logic, fix gesture camera launchRoman Birg2016-02-101-1/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pattern visibility settings (1/2)Michael Bestas2016-02-032-25/+26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemUi: Nuke DONT_TRACK label, and introduce CMMetricsLogger constants.Adnan Begovic2016-01-111-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update private copy of PaletteSteve Kondik2016-01-085-701/+1004
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw: Remove duplicated locales.Adnan Begovic2016-01-081-1/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regional: Customize features for regional packagekaiyiz2016-01-041-2/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LockPatternUtils: Make settings getter and setters protectedd34d2015-12-111-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward port CM Screen Security settings (1/2)Michael Bestas2015-12-113-67/+208
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-076-73/+378
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't query ChooserTargetService apps that haven't been used recentlyAdam Powell2015-10-211-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Fix jank when intent resolver/chooser windows animate inAdam Powell2015-10-191-0/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix wrongly laid out navigation color view" into mnc-dr-devAdrian Roos2015-10-161-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrongly laid out navigation color viewAdrian Roos2015-10-151-9/+9
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ChooserTarget app scoringAdam Powell2015-10-161-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Reduce delay of floating toolbar appearance.Abodunrinwa Toki2015-10-162-6/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bugs introduced in ChooserActivityAdam Powell2015-10-141-7/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add animation and positional stability to intent chooser UI" into mnc-...Adam Powell2015-10-123-57/+335
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add animation and positional stability to intent chooser UIAdam Powell2015-10-023-57/+335
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CM PlatLogo (1/2)Michael Bestas2015-12-051-1/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "utils: Introduce ScreenType class"Michael Bestas2015-12-011-66/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw: Move Secure settings to CMSettingsd34d2015-11-121-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0513-191/+668
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-devJeff Sharkey2015-09-302-11/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relax auto-launch checks for GET_CONTENT.Jeff Sharkey2015-09-292-11/+28
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" ...Adam Lesinski2015-09-291-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix asymmetry in parceling/unparceling code for BatteryStats summaryAdam Lesinski2015-09-281-6/+11
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-devBill Rassieur2015-09-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix jank: Don't write lockout deadline if not neededJorim Jaggi2015-09-281-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Bump BatteryStats versionAdam Lesinski2015-09-271-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Deliver camera launch source for analyticsJorim Jaggi2015-09-241-1/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-devAdam Lesinski2015-09-221-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Fix Array Index Out of Bounds in BatteryStatsImplAdam Lesinski2015-09-211-4/+13
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | |