summaryrefslogtreecommitdiffstats
path: root/Settings
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/pla...Michael Bestas2016-05-0285-528/+7058
* Automatic translation importMichael Bestas2016-04-165-13/+715
* Automatic translation importMichael Bestas2016-04-065-4/+667
* Automatic translation importMichael Bestas2016-03-287-38/+1244
* Automatic translation importMichael Bestas2016-03-1715-10/+375
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-1085-7058/+528
|\
| * am 05089ad7: am af5df64e: Add Usage and Diagnostics to main screenTony Mantler2015-10-144-1/+22
| |\
| | * am af5df64e: Add Usage and Diagnostics to main screenTony Mantler2015-10-144-1/+22
| | |\
| * | | am 49728d83: am cba60bd0: Fix NPE in storage migration settingsTony Mantler2015-10-081-1/+3
| |\| |
| | * | am cba60bd0: Fix NPE in storage migration settingsTony Mantler2015-10-081-1/+3
| | |\ \
| * | | | am 968879e1: am 16b83b90: am 4f6ffab4: Allow restricted profile to use locationTony Mantler2015-09-011-3/+0
| |\| | |
| | * | | am 16b83b90: am 4f6ffab4: Allow restricted profile to use locationTony Mantler2015-09-011-3/+0
| | |\ \ \
| * | | | | am 560cf6e0: am e4200126: am 6d951a21: Add security patch level to about screenTony Mantler2015-08-262-0/+25
| |\| | | |
| | * | | | am e4200126: am 6d951a21: Add security patch level to about screenTony Mantler2015-08-262-0/+25
| | |\ \ \ \
| * | | | | | am 82e542b2: am 702569ad: am 0bfaa3c0: Add conditional entry to Google SettingsTony Mantler2015-07-293-8/+44
| |\| | | | |
| | * | | | | am 702569ad: am 0bfaa3c0: Add conditional entry to Google SettingsTony Mantler2015-07-293-8/+44
| | |\ \ \ \ \
| * | | | | | | am f52151ba: am 69f54607: am 718a802d: Add confirmation dialog for restartingTony Mantler2015-07-211-2/+55
| |\| | | | | |
| | * | | | | | am 69f54607: am 718a802d: Add confirmation dialog for restartingTony Mantler2015-07-211-2/+55
| | |\ \ \ \ \ \
| * | | | | | | | am 662d4490: am 521347a5: am ce153428: Merge "Scan storage volumes post-setup...Tony Mantler2015-07-152-0/+48
| |\| | | | | | |
| | * | | | | | | am 521347a5: am ce153428: Merge "Scan storage volumes post-setup" into mnc-devTony Mantler2015-07-152-0/+48
| | |\ \ \ \ \ \ \
| * | | | | | | | | am 76fb1bbf: am 3c82f36a: am 7caeee24: Merge "Don\'t show storage pop-up if s...Tony Mantler2015-07-151-0/+7
| |\| | | | | | | |
| | * | | | | | | | am 3c82f36a: am 7caeee24: Merge "Don\'t show storage pop-up if setup is not c...Tony Mantler2015-07-151-0/+7
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | am fc3723f0: am 7583a649: am 6e2e3949: Fix a bug in on/off checked statusJinsuk Kim2015-07-151-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | am 7583a649: am 6e2e3949: Fix a bug in on/off checked statusJinsuk Kim2015-07-151-1/+1
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am 30e8d62a: am 6b7690cc: am 698056b7: Don\'t show storage notification acros...Tony Mantler2015-07-141-0/+14
| |\| | | | | | | | | |
| | * | | | | | | | | | am 6b7690cc: am 698056b7: Don\'t show storage notification across usersTony Mantler2015-07-141-0/+14
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am 31a0f0fb: am a7f9217c: am 8f4a4dce: Merge "Fix daydreams for restricted pr...Kris Giesing2015-07-141-0/+5
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am a7f9217c: am 8f4a4dce: Merge "Fix daydreams for restricted profiles [1/2]"...Kris Giesing2015-07-131-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am 3f2e926a: am 8fbdd3ac: am 0e87be71: Merge "Do not throw exception when Mea...Zoltan Szatmary-Ban2015-07-141-1/+1
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 8fbdd3ac: am 0e87be71: Merge "Do not throw exception when MeasurementDetai...Zoltan Szatmary-Ban2015-07-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am 10b90fd2: am 17cbe4b0: am 31a60f35: Merge "Bail out of AMA if the app isn\...Tony Mantler2015-07-101-1/+7
| |\| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 0a87f7ca: am d260df68: am 375543ba: Merge "Adapt TvSettings to the new mul...Zoltan Szatmary-Ban2015-07-081-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2682120e: am 93e65510: am 0aaf4d97: Don\'t crash if UsbManager is not avai...Tony Mantler2015-07-071-8/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dc147123: Merge "Fix storage pop-up activity flags" into mnc-devTony Mantler2015-06-292-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 99861348: Merge "Don\'t use FLAG_NEW_DOCUMENT" into mnc-devTony Mantler2015-06-261-7/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c495fd75: Merge "Forget storage before formatting" into mnc-devTony Mantler2015-06-262-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1df072c2: Merge "Fix storage launch intent" into mnc-devTony Mantler2015-06-261-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f75ca4ad: Change dialog backgroundsTony Mantler2015-06-2610-19/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6ead36dd: Merge "Use Map.Entry instead of LinkedHashMap.Entry" into mnc-devTodd Volkert2015-06-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a667b504: Make "Wait for debugger" apply without rebootTony Mantler2015-06-241-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7e1c74cb: Merge "Show warning when private storage is removed/unplugged" i...Tony Mantler2015-06-243-22/+130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8af774b0: Merge "Change tv settings to use the package installer intent fo...Todd Volkert2015-06-243-114/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2147b337: Merge "Fix AppManagementActivity to update storage info after mo...Tony Mantler2015-06-241-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16e23290: Merge "Get rid of ResizingTextView" into mnc-devTony Mantler2015-06-234-92/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e1ccb3db: Fix crash when selecting "Nothing" debug appTony Mantler2015-06-231-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 43f390a8: Disable "Learn More" until we have something to link toTony Mantler2015-06-231-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 135a119a: Merge "Fix fragment malarky in BluetoothPairingDialog" into mnc-devTony Mantler2015-06-237-218/+187
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ad135a95: Fix icons for storage dialogsTony Mantler2015-06-2312-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 699688eb: Merge "Rework StorageResetActivity to show unsupported and missi...Tony Mantler2015-06-223-54/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0fa26636: Merge "Add primary storage migration" into mnc-devTony Mantler2015-06-226-5/+287
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 12:07:17 +0000