summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | Merge "Preserve FRP lock if wiped during SUW" into mnc-devRussell Brenner2015-11-171-2/+7
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Preserve FRP lock if wiped during SUWRussell Brenner2015-11-131-2/+7
| | | | * | | | | | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-121-16/+17
| | | | |/ / / / / / / / / /
| | * | | | | | | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-121-16/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Uncheck checkbox for contact sharing by default for non carkit devices.Sanket Padawe2015-11-121-16/+17
| | * | | | | | | | | | | | Null check queryIntentServicesJason Monk2015-11-091-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Null check queryIntentServicesJason Monk2015-11-091-3/+6
| | * | | | | | | | | | | | Merge "Further tweak to issue #issue #25371736: Don\'t include z-ram allocati...Dianne Hackborn2015-10-302-7/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Further tweak to issue #issue #25371736: Don't include z-ram allocations in A...Dianne Hackborn2015-10-292-7/+12
| | * | | | | | | | | | | | Merge "Fix issue #25371736: Don\'t include z-ram allocations in Android OS" i...Dianne Hackborn2015-10-291-0/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Fix issue #25371736: Don't include z-ram allocations in Android OSDianne Hackborn2015-10-291-0/+40
| | * | | | | | | | | | | | Fix crash in Settings from uninstallJason Monk2015-10-221-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | * | | | | | | | | | | | Allow access to permissions, even if app has noneJason Monk2015-10-211-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-devMichael Wright2015-10-203-10/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Hide empty data usage cycles." into mnc-dr-devJeff Sharkey2015-10-201-3/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Clamp large data usage values." into mnc-dr-devJeff Sharkey2015-10-201-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Hide SIM and IMEI for wifi only devicesJason Monk2015-10-201-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-devJason Monk2015-10-161-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am de005547: Merge "Bail if activity was destroyed." into mnc-dr-devJeff Sharkey2015-10-161-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1704ca96: Merge "Change to add user_visible field to Carriers table." into...Amit Mahajan2015-10-141-10/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its prof...Erik Kline2015-10-141-1/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 90de3beb: Disable app-link preferences for browser appsChristopher Tate2015-10-093-46/+96
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-devZach Kuznia2015-10-012-0/+89
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 655ddae8: [Fingerprint] Fix link accessibilityMaurice Lam2015-09-253-0/+942
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16a8e8d1: Make picture color mode less of a featureJason Monk2015-09-233-68/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c5fa6e26: Add a dummy string to help to add "fingerprint" to searchJim Miller2015-09-231-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0f1e7bfe: Merge "Revert "Remove don\'t kill flag from CryptKeeper to stop ...Paul Lawrence2015-09-191-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into m...Jim Miller2015-09-191-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c6a96d40: Merge "Add color transform setting" into mnc-dr-devJustin Harrison2015-09-192-0/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc...Adam Lesinski2015-09-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam"...Paul Lawrence2015-09-181-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning checkHyejin2015-09-152-22/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity w...Selim Cinek2015-09-121-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into...Jorim Jaggi2015-09-111-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential im...Jorim Jaggi2015-09-112-19/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker ...Jorim Jaggi2015-09-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d3c60afe: Include the usb data mode regardless of data roleJason Monk2015-09-101-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-...Jorim Jaggi2015-09-101-1/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger...Jim Miller2015-09-095-23/+98
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfigSungmin Choi2015-09-091-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b83cbe20: Fix buildJorim Jaggi2015-09-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8c543276: Fix crash in fingerprint settings when rotatingJorim Jaggi2015-09-081-7/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-devJason Monk2015-09-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-devJorim Jaggi2015-09-031-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr...Maurice Lam2015-09-021-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 05c7dde1: To hide none security option, use config_hide_none_security_opti...Sungmin Choi2015-09-021-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-devXiyuan Xia2015-09-013-66/+179
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr...Jason Monk2015-09-011-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-...Xiyuan Xia2015-09-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-devMaurice Lam2015-08-281-2/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \