summaryrefslogtreecommitdiffstats
path: root/core/java/com
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+13
|\
| * Backport ChooserTarget package source check from NAdam Powell2016-05-271-1/+13
* | Framework: allow ResolverActivity to be specialized from other packageWilhelm Fitzpatrick2016-06-092-2/+148
* | Add CM version to dropbox entriesScott Mertz2016-05-251-0/+1
* | SpamFilter : Hide option if notification cannot be filteredDanesh M2016-05-131-1/+18
* | LockPatternUtils: Use the actual user id to set pattern sizeScott Mertz2016-04-141-10/+10
* | Implement left swipe on lockscreenDanesh M2016-04-011-0/+1
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-116-37/+109
|\ \
| * | Don't assume kernel tick is 100HzThierry Strudel2016-01-222-5/+12
| * | DO NOT MERGE: Fix batterystats battery level int packingAdam Lesinski2015-12-151-6/+10
| * | Allow access to deprecated LOCK_PATTERN_ENABLED flag.Bryce Lee2015-12-141-0/+18
| |\ \
| | * | Allow access to deprecated LOCK_PATTERN_ENABLED flag.Bryce Lee2015-12-141-0/+18
| | * | DO NOT MERGE ANYWHERE: Fix batterystats battery level int packingAdam Lesinski2015-11-201-6/+10
| * | | Prevent DivideByZero error in BatteryStatsImplAdam Lesinski2015-12-101-20/+29
| * | | Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()Amit Mahajan2015-11-181-0/+27
| |/ /
| * | Merge "Don\'t query ChooserTargetService apps that haven\'t been used recentl...Adam Powell2015-10-211-0/+5
| |\ \ | | |/
| * | Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in"...Adam Powell2015-10-201-0/+13
| |\ \
| * \ \ am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-devAdrian Roos2015-10-161-9/+9
| |\ \ \
| * \ \ \ am 749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-devAdam Powell2015-10-161-1/+1
| |\ \ \ \
| * \ \ \ \ am 9c76f61d: Merge "DO NOT MERGE: Reduce delay of floating toolbar appearance...Abodunrinwa Toki2015-10-162-6/+4
| |\ \ \ \ \
| * \ \ \ \ \ am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-devAdam Powell2015-10-141-7/+18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 11af1878: Merge "Add animation and positional stability to intent chooser ...Adam Powell2015-10-123-57/+335
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-devJeff Sharkey2015-09-302-11/+28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatterySt...Adam Lesinski2015-09-291-6/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" in...Bill Rassieur2015-09-281-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am d5f10154: Bump BatteryStats versionAdam Lesinski2015-09-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-devJorim Jaggi2015-09-251-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 1b57758a: Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into m...Adam Lesinski2015-09-221-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am b49245f9: Merge "Frameworks/base: Propagate boot status to installd" into ...Andreas Gampe2015-09-222-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr...Adam Lesinski2015-09-182-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-...Adam Lesinski2015-09-185-101/+288
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b67a6b8: Merge "Badge ChooserActivity choices with their app icon for dis...Adam Powell2015-09-182-7/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetSe...Adam Powell2015-09-162-28/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-devAndres Morales2015-09-161-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for 5d0e02b6 to cw-e-devJorim Jaggi2015-09-091-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16093fe3: Revert "Disable fingerprint after force lock"Jorim Jaggi2015-09-101-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential...Adrian Roos2015-09-031-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is ...Clara Bayarri2015-09-021-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-devAdrian Roos2015-08-311-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc...Adam Lesinski2015-08-312-48/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-01-09 08:03:27 +0000