summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CM PlatLogo: CyanogenMod version preference (2/2)Danesh Mondegarian2015-12-081-0/+14
| | | | | | | Binds the CyanogenMod version preference to launch CM easter egg upon multiple taps. Change-Id: I8e06642944d24581c0932c9964f2d9615bfcb832
* Settings: add quick-quick settings pulldown settingRoman Birg2015-12-072-0/+9
| | | | | Change-Id: I986ea9d5e7037e58b1d185aba3daaa8fa7f6a9a7 Signed-off-by: Roman Birg <roman@cyngn.com>
* Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-0756-203/+348
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Settings into HEAD Android 6.0.1 release 3 Change-Id: If54bacef03fc826fd02ca48db5ef3a25c8fc7127
| * Null check queryIntentServicesJason Monk2015-11-091-3/+6
| | | | | | | | | | Bug: 25575738 Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
| * Further tweak to issue #issue #25371736: Don't include z-ram allocations in ↵Dianne Hackborn2015-11-022-7/+12
| | | | | | | | | | | | | | | | | | Android OS Make sure the duration shown for z-ram is sane (the maximum of the other process durations of that app). Change-Id: I62c46b89f927b2c7c16f5c31f6910419b2bdd130
| * Fix issue #25371736: Don't include z-ram allocations in Android OSDianne Hackborn2015-10-291-0/+40
| | | | | | | | | | | | | | Just distribute them across all of the running apps, by creating an additional fake "z-ram" process for each of them. Change-Id: I9b4efe9c7b907779a0ec76cb8652709619e2e686
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-283-3/+3
| | | | | | | | | | Change-Id: I2c1d24dee82b74a8db0f2fa30077b71e085ca0cd Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-264-17/+17
| | | | | | | | | | Change-Id: I63ec2877912de3a9884975bfa5fee6849d0d191f Auto-generated-cl: translation import
| * Fix crash in Settings from uninstallJason Monk2015-10-221-0/+4
| | | | | | | | | | Bug: 25171390 Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-2113-13/+13
| | | | | | | | | | Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9 Auto-generated-cl: translation import
| * Allow access to permissions, even if app has noneJason Monk2015-10-201-4/+0
| | | | | | | | | | Bug: 24026650 Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
| * Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-devMichael Wright2015-10-203-10/+26
| |\
| | * Always show pairing dialog for device-specific keyboard.Michael Wright2015-09-173-10/+26
| | | | | | | | | | | | | | | Bug: 22876536 Change-Id: Ief9f6343d435747050bb7910f934e4777f5116de
| * | Merge "Hide empty data usage cycles." into mnc-dr-devJeff Sharkey2015-10-201-3/+26
| |\ \
| | * | Hide empty data usage cycles.Jeff Sharkey2015-10-191-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building list of historical data usage cycles, omit cycles that don't contain any data usage. A bad NITZ or NTP fix may have caused us to record some usage in 1970 or 2038, which would have shown all the cycles in between. Now we hide empty cycles to keep things clean. Bug: 18282691 Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
| * | | Merge "Clamp large data usage values." into mnc-dr-devJeff Sharkey2015-10-201-0/+3
| |\ \ \ | | |/ /
| | * | Clamp large data usage values.Jeff Sharkey2015-10-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without clamping, they can wrap around to negative values and cause all sorts of havok. 1TB ought to be enough for anyone: that's 3Mbps for a solid month. Bug: 24555152 Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 25001286 Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
| * | | Hide SIM and IMEI for wifi only devicesJason Monk2015-10-191-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 24342670 Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
| * | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-10-1913-22/+22
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-1913-22/+22
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8 Auto-generated-cl: translation import
| * | | am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-190-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '99131cf64253cf997d8ee6e356843e376a141846': Import translations. DO NOT MERGE
| | * | am f191953c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'f191953c77af3c5b78e576a430577aaf050aa5f1': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEGeoff Mendal2015-10-196-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2b08418cad5acba5716761650814489a2a94234 Auto-generated-cl: translation import
| * | | | Merge "Fix crashes in Settings" into mnc-dr-devJason Monk2015-10-162-23/+5
| |\ \ \ \
| | * | | | Fix crashes in SettingsJason Monk2015-10-162-23/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems from unsupported intents being launched through adb. Remove the ones we can, fix the other. Bug: 19634064 Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
| * | | | | Merge "Bail if activity was destroyed." into mnc-dr-devJeff Sharkey2015-10-161-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bail if activity was destroyed.Jeff Sharkey2015-10-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24172045 Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
| * | | | | Merge "Change to add user_visible field to Carriers table." into mnc-dr-devAmit Mahajan2015-10-141-10/+14
| |\ \ \ \ \
| | * | | | | Change to add user_visible field to Carriers table.Amit Mahajan2015-10-081-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adding config to control if adding APNs is allowed. Bug: 24519879 Bug: 24681288 Change-Id: I59466f5489606162a10e883ede378e575a189fb3
| * | | | | | Merge "Unconfigure the lockdown VPN if the user forgets its profile." into ↵Erik Kline2015-10-141-1/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| | * | | | | | Unconfigure the lockdown VPN if the user forgets its profile.Lorenzo Colitti2015-10-131-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if the user clicks "forget" on the configuration dialog for the profile that is currently being used by the always-on VPN, we don't disable the lockdown VPN, and we crash on next boot because ConnectivityService tries to start LockdownVpnTracker with an invalid configuration. Fix this by removing the LOCKDOWN_VPN variable in the keystore (which disables the always-on VPN), and notifying ConnectivityService. Bug: 23625458 Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
| * | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-10-143-13/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-143-13/+13
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5 Auto-generated-cl: translation import
| * | | | | | | am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am ↵Geoff Mendal2015-10-140-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE * commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98': Import translations. DO NOT MERGE
| | * | | | | | am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am ↵Geoff Mendal2015-10-140-0/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46eb1857: (-s ours) Import translations. DO NOT MERGE * commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2': Import translations. DO NOT MERGE
| | | * | | | | am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import ↵Geoff Mendal2015-10-140-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'cec2a65a98161c6c69e373647f03745c59246097': Import translations. DO NOT MERGE
| | | | * \ \ \ \ am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-140-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '26bb544ff277020444b79543302b015160ead18a': Import translations. DO NOT MERGE
| | | | | * \ \ \ \ am 46eb1857: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-140-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7': Import translations. DO NOT MERGE
| | | | | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-143-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62 Auto-generated-cl: translation import
| * | | | | | | | | | am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | * commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91': Import translations. DO NOT MERGE
| | * | | | | | | | am 974dfc1f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-140-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a': Import translations. DO NOT MERGE
| | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-143-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586 Auto-generated-cl: translation import
| * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I324bc1847519b9058a6951a6ef63e5668e9746ba
| * | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-10-1211-26/+26
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-1211-26/+26
| | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib419916b4455d3b42a8a8b2395c14dba9afcc8a3 Auto-generated-cl: translation import
| * | | | | | | | | am 4accfd0b: (-s ours) am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am ↵Geoff Mendal2015-10-120-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE * commit '4accfd0b121d2b258bca301b16f62c1ac760d89c': Import translations. DO NOT MERGE
| | * | | | | | | | am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am ↵Geoff Mendal2015-10-120-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fedc0fd: (-s ours) Import translations. DO NOT MERGE * commit '1bd19dd17e2038df6c374ca6ed48498de4dde730': Import translations. DO NOT MERGE
| | | * | | | | | | am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import ↵Geoff Mendal2015-10-120-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d': Import translations. DO NOT MERGE
| | | | * | | | | | am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-10-120-0/+0
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2025-01-27 01:44:19 +0000