summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_bas...HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2017-05-021-0/+6
|\
| * DO NOT MERGE: Check provider access for content changes.Jeff Sharkey2017-03-131-0/+6
* | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-12-1211-77/+166
|\ \ | |/
| * Themes: Don't cache explicitly themed resourcesBharadwaj Narasimha2016-11-281-26/+1
| * NotificationManager: Concentrate LED light capabilities at a single locationRicardo Cerqueira2016-11-102-0/+30
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-3/+3
| |\
| | * Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9...Jeff Sharkey2016-09-271-3/+3
| * | Support enforcing a minimum delay between notification sounds of an app.Danny Baumann2016-10-201-0/+3
| * | (Optionally) allow vibration during priority zen mode.Danny Baumann2016-10-192-3/+3
| * | [2/2] base: cm custom boot dexopt UIAlexander Martinz2016-08-102-8/+21
| * | IconPackHelper:Use un-tinted iconback when no defaultSwatchcolor is specifiedBharadwaj Narasimha2016-08-091-5/+3
| * | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-022-5/+7
| |\ \ | | |/
| | * Don't trust callers to supply app info to bindBackupAgent()Christopher Tate2016-06-242-5/+7
| | * DO NOT MERGE ANYWHERE: Don't change screen on time on time changesAdam Lesinski2016-02-241-2/+6
| * | Frameworks: Add per app controls for LP keyguard notifications (1/2)Lars Greiss2016-06-013-0/+29
| * | Core: Fix OOBMichael W2016-05-301-0/+5
| * | am: Handle unchecked activity starts for protected components.Adnan Begovic2016-05-191-2/+4
| * | CmRes: Attach themed cmsdk resources to assetsd34d2016-05-101-0/+23
| * | Themes: Restore original value if getValue failsd34d2016-04-131-25/+34
* | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_b...Wolfgang Wiedmeyer2016-03-1814-102/+249
|\ \ \ | |/ /
| * | Show icons of only background apps in ToastsMarcel Dopita2016-03-163-0/+40
| * | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-114-66/+145
| |\ \
| | * | Don't change screen on time on time changesAdam Lesinski2016-01-281-2/+6
| | * | DO NOT MERGE Remove more extras during notification lightening.Dan Sandler2015-12-121-5/+18
| | * | ActivityView gets its own thread pool.Daniel Koulomzin2015-11-111-60/+112
| | * | Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-devRiley Andrews2015-11-041-1/+4
| | |\ \
| | | * | Convert ashmem bitmap thresholds to constants.Riley Andrews2015-11-031-1/+4
| | * | | Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr...Ian Pedowitz2015-11-031-1/+3
| | |\ \ \ | | | |/ /
| | | * | Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr...Ian Pedowitz2015-11-031-1/+3
| | | |\ \
| | | | * | Limit persistent ashmem backed fds to a minimum of 128kB.Riley Andrews2015-11-031-1/+3
| | * | | | Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot...Dianne Hackborn2015-11-031-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix issue #25357209: Could not send SMS or MMS messages, had to rebootDianne Hackborn2015-11-021-1/+2
| | | |/ /
| | * | | Merge "Retain fragment loaders" into mnc-dr-devTodd Kennedy2015-10-204-16/+12
| | |\ \ \ | | | |/ /
| | * | | Merge "Set host when restoring a fragment" into mnc-dr-devTodd Kennedy2015-10-191-0/+1
| | |\ \ \
| | * \ \ \ Merge "Don\'t allow concurrent permission requests." into mnc-dr-devSvetoslav Ganov2015-10-191-0/+29
| | |\ \ \ \
| | * \ \ \ \ am fe45f1b9: Merge "Default location is "internalOnly" when undefined." into ...Jeff Sharkey2015-10-121-1/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyedNed Burns2015-09-251-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Kill ActivityView's background thread when it's destroyedNed Burns2015-09-231-0/+2
| | * | | | | | | am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-devJorim Jaggi2015-09-251-0/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-devTodd Kennedy2015-09-233-1/+16
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Cherry-pick system theme rebase to fix square UI on round watches" int...Alexander Hills2015-09-141-0/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Cherry-pick system theme rebase to fix square UI on round watchesAlan Viverette2015-09-141-0/+5
| | * | | | | | | | | | Merge "Fixes cloned notification actions missing icon." into cw-e-devGus Prevas2015-09-101-0/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fixes cloned notification actions missing icon.Gus Prevas2015-09-101-0/+3
| | * | | | | | | | | | am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-devSvetoslav Ganov2015-09-091-1/+14
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 9e25e164: am e7078e18: Merge "Ensure host is set before onInflate()" into ...Todd Kennedy2015-08-311-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am b5e47228: Add StrongAuthTrackerAdrian Roos2015-08-223-34/+32
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkS...Esteban Talavera2015-08-171-6/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permiss...Svetoslav Ganov2015-08-143-0/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state...Jeff Sharkey2015-08-141-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \