summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Settings: Respect config_proximityCheckOnWakeEnabledByDefaultGabriele M2016-03-211-1/+7
| | | | | | | | | | | | | | | | | | | | | Also, set the correct value for PROXIMITY_ON_WAKE when the feature is disabled. Change-Id: Ibf9dd1c64aeb076bc72f328d50825790aef2a50b
| * | Settings : Add per app internet/data controlDanesh M2016-03-216-48/+143
| | | | | | | | | | | | | | | | | | | | | CYAN-3976 CRACKLING-834 Change-Id: I13192df837c057b5cadde8f31532e12daaf3c1b0
| * | Settings: fix BT switch enabling discoverable modeRoman Birg2016-03-212-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roman Birg <roman@cyngn.com> Conflicts: src/com/android/settings/bluetooth/BluetoothEnabler.java Bug: CYNGNOS-2271 Change-Id: I6b2dff88fb858d34a1b534705b2c67f5ab4c2d29
| * | Move external input tile inclusion to device repo.Danny Baumann2016-03-214-108/+2
| | | | | | | | | | | | Change-Id: I1afa10da1b9e0cc35c5198d1cbd5c13e2b4c343d
| * | Settings: Update contributors cloud DBMichael Bestas2016-03-201-0/+0
| | | | | | | | | | | | Change-Id: I2732f74c7271638f02791b26f2fd476b3d6e3440
| * | Improve protected apps stringMichael Bestas2016-03-201-1/+1
| | | | | | | | | | | | Change-Id: I3704910d99b5d93bc2f423229da72558d9fe6fb9
| * | Automatic translation importMichael Bestas2016-03-18114-103/+8288
| | | | | | | | | | | | Change-Id: Ide7fdb04e25ae1d25205a835b37ff8a004660ad4
* | | Merge branch 'cm-13.0' of ↵Wolfgang Wiedmeyer2016-03-18317-3073/+62375
|\ \ \ | |/ / | | | | | | https://github.com/CyanogenMod/android_packages_apps_Settings into replicant-6.0
| * | Re-expose hardcoded white text colorsDave Kover2016-03-179-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the original expose pass, all of the hardcoded white text colors were given a generic color that they all pointed to. This is great, but very inflexible for themes that might need to tweak just one of those instances. With this patch, we will create new text colors (and allow some textviews to share it when it makes sense) and point all of those back to the text_color_white so that existing themes are not broken. Change-Id: Iae850b7f75d319bd308f001058918e4466c70dca
| * | Themes: Expose Hard coded icon tint in power summary settingsBryan Owens2016-03-162-1/+4
| | | | | | | | | | | | | | | Change-Id: I9b41af6ecc8843623815c08561f7bd5d0f3e4d77 Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
| * | DisplayColor: clamp maximum value to 1.0fDan Elkouby2016-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Sometimes when adjusting to 100%, this value can overflow causing the activity to crash. Change-Id: If578e98618ddae5d60924189feb3aafc6072d906
| * | Settings: ask telephony for network selectionRoman Birg2016-03-155-158/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring profiles and selecting a network mode override, ask Telephony to provide the UI for showing the proper network modes. After the user has selected it, we receive the result, and save it in the profile. Ref: CYNGNOS-1463 Change-Id: I866ed1bc1c915ae00804b07dbbafa86e679a5fa7 Signed-off-by: Roman Birg <roman@cyngn.com>
| * | Settings : Add multiuser support for CMHardwareDanesh M2016-03-146-56/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show button for other users - Use services instead of CMHardware for vibrator and touch sensitivity - Do a one time restore of tunable settings CYNGNOS-1166 Change-Id: I0de8eef6bf73c344ee5789e9650dd96b25b1a6bc
| * | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-10106-1571/+1080
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Settings into cm-13.0 Android 6.0.1 release 22 Change-Id: Ided010bc125199d47ca59d10f0ed5032a26632ff
| | * | Import translations. DO NOT MERGEGeoff Mendal2016-01-2778-157/+355
| | | | | | | | | | | | | | | | | | | | Change-Id: I24a034300aade7c9b389c92a29433347cac07070 Auto-generated-cl: translation import
| | * | Added toast message to color temperature settingSteve Pfetsch2016-01-222-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a toast message to inform the user that the color temperature setting is applied once the display is off. Bug:26110238 Change-Id: Ia773581eb441ed2f4ac44b20e611ad3700e8abbf
| | * | Import translations. DO NOT MERGEGeoff Mendal2016-01-1878-308/+542
| | | | | | | | | | | | | | | | | | | | Change-Id: I415c6bc5d49ea34685d6219dfb8482294f17b692 Auto-generated-cl: translation import
| | * | Enable color temperature developer settingSteve Pfetsch2016-01-143-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a switch in Developer Settings to enable "cool" color temperature mode. Bug: 26110238 Change-Id: Id0ab3283c1ee3208287c8dca11298a4bc367b314
| | * | Merge "Add strings for color temperature developer option" into mnc-dr1.5-devJustin Harrison2016-01-141-0/+7
| | |\ \
| | | * | Add strings for color temperature developer optionSteve Pfetsch2016-01-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introducing en-US strings for color temperature settings ahead of code changes. Bug: 26110238 Change-Id: I5a12aa35a730d93daa6383f7dde7d3c90db1d74b
| | * | | Import translations. DO NOT MERGE am: 6a52aca8ea -s ours am: 21e3d54adc -s ↵Geoff Mendal2016-01-130-0/+0
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: b994c93600 -s ours * commit 'b994c936002bacf9d6fe314f9ebef3432a58dd6c': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGE am: 6a52aca8ea -s oursGeoff Mendal2016-01-130-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 21e3d54adc -s ours * commit '21e3d54adc473b20c2591cd348b79fe0dd43e61e': Import translations. DO NOT MERGE
| | | | * \ Import translations. DO NOT MERGEGeoff Mendal2016-01-130-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6a52aca8ea -s ours * commit '6a52aca8eab3bb879fa7376747f23526cb8398bc': Import translations. DO NOT MERGE
| | | | | * | Import translations. DO NOT MERGEGeoff Mendal2016-01-1264-787/+787
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 25447946 Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81
| | * | | | | Select or not Wi-Fi Calling preference as CarrierConfigSungmin Choi2016-01-111-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some operators support Wi-Fi Calling only, not VoLTE. They don't need "Cellular preferred" option. In this case, set uneditalbe attribute for preferred preference. Bug: 26299288 Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
| | * | | | | DO NOT MERGE Modify system settings: incorrect UI stateSvetoslav2015-12-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The privilege for an app to write to the system settings is protected by an app-op signature permission. App-op permissions are special: if the app-op is deny/allow we deny/allow write access; if the app-op is default holding the permission determies write access. The settings code assumes that CHANGE_NETWORK_STATE is an app op permission (system|appop) while it is a normal permission which any app gets by declaring it used in the manifest. The side effect is that the state of the toggle in the UI for write system settings will initially be in the wrong state if the app uses both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in the public API an app uses to check write settings access would return the opposite since it checks the WRITE_SETTINGS permission and its app op. Hence, if an app requires write settings to start the user will see in the settings UI it has access but the app will not have access, so the app would prompt the user to allow write settings. The non-obvious fix is for the user to toggle the setting off and on to get the app op in the right state and be able to launch the app. bug:25843134 Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d (cherry picked from commit 356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-11164-44372/+59552
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 26151591 Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
| | * | | | | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-12-12166-62468/+43942
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit df57be8aef6dd1760e72d7f76490048eeb425a3e. Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-11166-43942/+62468
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 26151591 Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
| | * | | | | Add IMS settings to Network setting resetHyejin Kim2015-12-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the factory reset function to be used to reset IMS settings BUG=25300757 Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
| | * | | | | Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ↵Geoff Mendal2015-11-200-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 74e9c3d348 -s ours * commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93': Import translations. DO NOT MERGE
| | | * \ \ \ \ Import translations. DO NOT MERGE am: 2102350ea3 -s oursGeoff Mendal2015-11-200-0/+0
| | | |\ \ \ \ \ | | |/ / / / / / | | | | _ / / / | | | | / / / | | | | | | | | | | | | | | | | | | | | | am: 75dd183bf7 -s ours * commit '75dd183bf7b99c995fe773e7b53a6604a6b53512': Import translations. DO NOT MERGE
| | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-200-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2102350ea3 -s ours * commit '2102350ea33d8bbed50d9447889876fa295b3e8a': Import translations. DO NOT MERGE
| | | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-11-2018-205/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
| | * | | | | Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d * commit 'f0d538f08da7c45e545e51e93373afe38cbd518f': Block developer settings during SUW
| | | * | | | Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 * commit '2b295010392c532a47e02e5b003459a50d6d5a62': Block developer settings during SUW
| | | | * | | Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 * commit '5950ff1d69ca27c09569f40862201ede261c831e': Block developer settings during SUW
| | | | | * | Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed ↵Russell Brenner2015-11-172-1/+11
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b am: 8e4f6fbc2e * commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70': Block developer settings during SUW
| | | | | | * \ Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3edRussell Brenner2015-11-172-1/+11
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: afe5eada5b * commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4': Block developer settings during SUW
| | | | | | | * \ Merge "Block developer settings during SUW" into lmp-mr1-devRussell Brenner2015-11-172-1/+11
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 56d630a3ed * commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd': Block developer settings during SUW
| | | | | | | | * \ Merge "Block developer settings during SUW" into lmp-mr1-devRussell Brenner2015-11-172-1/+11
| | | | | | | | |\ \
| | | | | | | | | * | Block developer settings during SUWRussell Brenner2015-11-102-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block access to development settings by tapping on the build number in "About phone". Once SUW has completed, taps will be allowed. Bug: 25290269 Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
| | * | | | | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 am: 8199c3028c * commit '8199c3028c05cd9c85b6f26fe656518f536bda69': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | * | | | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 * commit '38e932dc816fe7aff6443bfa5648743f527aa097': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | * | | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 * commit '439033dd93417b98acff392865166503a507ff30': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | | * | | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: ↵Russell Brenner2015-11-170-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97759fa8d1 am: 6967df6421 -s ours * commit '6967df642114a9c84d993cfd544d5a32f04c26b1': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | | | * | | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79Russell Brenner2015-11-171-2/+7
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 97759fa8d1 * commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | | | | * | | | [DO NOT MERGE] Preserve FRP lock if wiped during SUWRussell Brenner2015-11-171-2/+7
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 14bf226c79 * commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e': [DO NOT MERGE] Preserve FRP lock if wiped during SUW
| | | | | | | | * | | [DO NOT MERGE] Preserve FRP lock if wiped during SUWRussell Brenner2015-11-131-2/+7
| | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against FRP attacks by keeping the persistent data block intact, if a factory reset has been issued during SUW. Bug: 25290269 Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
| | * | | | | | | | Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de ↵Russell Brenner2015-11-171-2/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2075d98be6 am: 7d44fe6fdb * commit '7d44fe6fdb95dce08e4c8cd1a1c1a1c8f3ea4a63': Preserve FRP lock if wiped during SUW
generated by cgit v1.1 at 2025-08-18 08:25:23 +0000