Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,473 Commits 1 Branch 0 Tags
3eef202c8a506bdfe660277412d277f29d16a825
Commit Graph

30223 Commits

Author SHA1 Message Date
Automerger Merge Worker
3eef202c8a Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: 54933e3bb5 am: 117f719ba6 
Change-Id: I7ae5f0f93719189d6005a99b47a9575e47a8c51d
 2020-02-27 16:39:42 +00:00
Alex Johnston
251b06086e Merge "Add policy transparency dialog to 'Remove work profile'" 2020-02-27 16:22:31 +00:00
Automerger Merge Worker
117f719ba6 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: 54933e3bb5 
Change-Id: I8dea224359f1cf862fe30493f16e97d435820893
 2020-02-27 16:16:56 +00:00
Alex Johnston
56e8278498 Add policy transparency dialog to 'Remove work profile' 
* In New COPE mode, no explanation was being shown to the
  user as to why the work profile cannot be removed.
* This CL adds a policy transparency dialog when the
  'Remove work profile' preference is selected.
* This was done by modifying AccountRestrictionHelper to
  set the preference to disabled by admin if the device is
  in New COPE mode and the base restriction
  DISALLOW_REMOVE_MANAGED_PROFILE is enforced.

Bug: 149391073
Test: Manual testing
Change-Id: Iec0f57b988e1d4fd08bca040abd1bb30b6991507
 2020-02-27 10:16:40 +00:00
James.cf Lin
64ac0d4a74 [Settings] "Data during calls" in DDS SUB is still in advanced option. 
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Change-Id: I0121f06efb5257dccc05ad06b93a9db263f012b5
 2020-02-27 17:52:47 +08:00
Automerger Merge Worker
b6465cb5bb Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 am: 1c4f76ec18 am: e30e500acb 
Change-Id: I2a7034c1d51dd2da89c21e828992c34575fa67af
 2020-02-27 09:32:03 +00:00
Automerger Merge Worker
1c4f76ec18 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 
Change-Id: I86ded0cbe8c2b3960c7df9d4baeb14cc26a38e2f
 2020-02-27 09:07:55 +00:00
TreeHugger Robot
2f492604e5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev 2020-02-27 08:41:57 +00:00
Automerger Merge Worker
57e7ed0704 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: d7ba7964c1 am: 1d6fcee05e 
Change-Id: I3205776376d20d8586e4eeb4a081b5a53f588c3a
 2020-02-27 07:59:10 +00:00
Automerger Merge Worker
023c6a2f16 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 4278ed856f am: 1fcd257e80 
Change-Id: I2e104473d1aeda705f73b1533ee09b04bd9b8fa9
 2020-02-27 07:36:05 +00:00
Automerger Merge Worker
d7ba7964c1 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 
Change-Id: If6a6f5eccc086139583a5a3a8fab65050ad6c590
 2020-02-27 07:34:40 +00:00
Automerger Merge Worker
1fcd257e80 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 4278ed856f 
Change-Id: I78b21c0b757b75ad0d0973d3abf7a412aa600679
 2020-02-27 07:20:21 +00:00
Automerger Merge Worker
07c3fd058f Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f 
Change-Id: Ib0107cb103ece3b1bc82eb9d1b029f1f25e50bae
 2020-02-27 06:57:48 +00:00
Automerger Merge Worker
c586f9f7be Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 155fd0ce61 
Change-Id: I832ec03cc05bd9ca6bad3eb336221c640d861af9
 2020-02-27 06:57:35 +00:00
TreeHugger Robot
c023e758f7 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev 2020-02-27 06:57:22 +00:00
TreeHugger Robot
63105b36a7 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev 2020-02-27 06:42:25 +00:00
Automerger Merge Worker
23d5e32943 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 
Change-Id: I11f38c08c75c835821e92e761750ffb211b3b98e
 2020-02-27 06:25:22 +00:00
Betty Chang
efe4cc3db4 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev 2020-02-27 06:10:25 +00:00
Betty Chang
49f3da75cc Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" 2020-02-27 06:10:04 +00:00
Automerger Merge Worker
b71753f4e9 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba am: ab139d4620 
Change-Id: I76030197c101393b1fd98da1b4bf6bea2a1c804f
 2020-02-27 04:38:45 +00:00
Lee Chou
c12b1b40ee Fixes ApnEditor not restoring previous UI 
ApnEditor tries read and set the UI in onCreate, before the previous bundle
is restored. This caused problems when the configuration has changed (such
as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
 2020-02-27 11:50:03 +08:00
Automerger Merge Worker
5805974b93 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 
Change-Id: I82cc783d9990e9d16c7ecf2e4511aa0c8824fe56
 2020-02-27 03:44:23 +00:00
Automerger Merge Worker
a642ed8dba Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 
Change-Id: I8cb33aed6148d23d59f5757da26c40cbd602242d
 2020-02-27 03:44:12 +00:00
TreeHugger Robot
d20ca89728 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev 2020-02-27 03:29:20 +00:00
Automerger Merge Worker
71a3a316a5 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e am: b91c0a90dc 
Change-Id: I5c3d640cebd486da4bebbcab715a9029f46242e5
 2020-02-27 03:16:52 +00:00
TreeHugger Robot
640245cda6 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev 2020-02-27 03:15:29 +00:00
Automerger Merge Worker
b91c0a90dc Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e 
Change-Id: I3f58b9bc451dcd9ec9f0fad32a5b552ddb9bf7ca
 2020-02-27 03:00:31 +00:00
Automerger Merge Worker
b89c028b6d Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 
Change-Id: I3c0fb3002cf73110060dbff2d3095eebe08d1362
 2020-02-27 02:45:29 +00:00
tim peng
b6c8fab86f Merge "Launch output switcher with media package information" into rvc-dev 2020-02-27 02:18:03 +00:00
Automerger Merge Worker
c19a0bfd48 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: c980fd89d5 am: e5f870cb5b 
Change-Id: I4dd494fdd244addb6e8529d3b6a41b36da77f285
 2020-02-27 00:24:43 +00:00
Automerger Merge Worker
e5f870cb5b Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: c980fd89d5 
Change-Id: Idedb5fed62a4ac912b6471f7a33ec11363fed7c5
 2020-02-27 00:15:07 +00:00
Automerger Merge Worker
5145c82a2e Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 
Change-Id: I41d6c5acfac1296fb7500ed4a7e7998847776c16
 2020-02-26 23:44:06 +00:00
David Su
5c69259751 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev 2020-02-26 23:42:35 +00:00
Yi Jiang
c68a08fc7c Fixes incorrect settings usages in AdaptiveSleepPreferenceController 
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
(cherry picked from commit c0f9424779)
 2020-02-26 21:46:38 +00:00
Yi Jiang
ae7ff0c7f1 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" 2020-02-26 21:41:40 +00:00
Automerger Merge Worker
25e78ab67b Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 am: d9a7a6f881 am: d0776ff37d 
Change-Id: I3fbd30feb8534e8e29d387bb37d25a2c10a747b4
 2020-02-26 16:58:32 +00:00
Automerger Merge Worker
d0776ff37d Include changes that happen when history is open am: 8b031276b7 am: d60d581e78 am: d9a7a6f881 
Change-Id: Id6c205ea48d1c3dc35fc5d1e729f06e556520f43
 2020-02-26 16:40:46 +00:00
Automerger Merge Worker
70e242c19c Include changes that happen when history is open am: 8b031276b7 
Change-Id: I46e0855230e7f2cd36fbd3f38ec27d0a5f992074
 2020-02-26 16:13:36 +00:00
jasonwshsu
5c38960848 Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n) 
* AccessibilityShortcutPreferenceFragment was removed,
ShortcutServicePickerFragment should also removed.

Bug: 142529032
Test: Manual test
Change-Id: I08f96a3794235d308b10f3846f1b4f7bb4306923
 2020-02-26 21:17:59 +08:00
Julia Reynolds
8b031276b7 Include changes that happen when history is open 
Test: manual
Fixes: 150202759
Change-Id: Ic05be6c5c85a16567556d3f3902f4d557a8e7c1f
 2020-02-26 12:42:57 +00:00
changbetty
f64e2b3d10 [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: Manual and make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:30:14 +08:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:23:31 +08:00
Automerger Merge Worker
22d09f7a23 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 am: fe90e0f750 am: cd83b8f450 
Change-Id: I80e5fb347e321974a0cf97df76595cf29b36a5d1
 2020-02-26 05:34:18 +00:00
Automerger Merge Worker
fe90e0f750 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 am: 907051e8c0 
Change-Id: Ide5a5710d57542e239105c5e14ab11f3167ab42b
 2020-02-26 05:00:35 +00:00
Automerger Merge Worker
1d63b3f5c6 Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596 
Change-Id: Id570b28ba84f3d7de23fe399044f99d6766f0ede
 2020-02-26 04:45:05 +00:00
Julia Reynolds
9f6351b596 Merge "Stop controller from steal preference clicks" into rvc-dev 2020-02-26 04:32:52 +00:00
Automerger Merge Worker
e6dfc725db Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. am: ab05476fc1 
Change-Id: I644d6ae2ccebe74f3f6201e4b5595d06559d83da
 2020-02-26 03:03:54 +00:00
Yi Jiang
c0f9424779 Fixes incorrect settings usages in AdaptiveSleepPreferenceController 
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
 2020-02-25 13:48:06 -08:00
Julia Reynolds
bc0c7a626d Stop controller from steal preference clicks 
Test: atest
Fixes: 150175360
Change-Id: Ia22058df0ddbd1a274a508e2600d12aa1b67a343
 2020-02-25 10:49:23 -05:00
Peter_Liang
ab05476fc1 Fine-tune the widget of "Allow rich content in Accessibility Settings" for security. 
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
Merged-In: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
(cherry picked from commit 10bc375176)
 2020-02-25 09:06:12 +00:00