Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,372 Commits 1 Branch 0 Tags
63067d9e40a604cdb04ddba59248b0d29e2ed48c
Commit Graph

30648 Commits

Author SHA1 Message Date
Nathan Harold
07f739f737 Merge "Optimize NetworkScan for only User-Enabled RANs" 2020-02-27 21:35:06 +00:00
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
Automerger Merge Worker
d6b261c49e Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 
Change-Id: I38cf1e8f818084261759f2aca0c9d21f2c34e82d
 2020-02-27 15:58:41 +00:00
Automerger Merge Worker
c86e3124d4 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 
Change-Id: I97d2c2c3e80af00c64a54cfb7a6c0e844b2610a6
 2020-02-27 15:49:31 +00:00
Daniel Hunt
26aaf07e9d Fix NPE in PanelFragment 
When updating the panel after getting a second intent to the
activity, there is a small window of opportunity for the user
to close the activity before the animation ends, causing an
NPE when onFinish is called as the activity already closed down.
This change will check that there is an activity before trying
to finish it.

Bug: 150322041
Test:
For an easy way to reproduce this, turn the screen on and run the
following in a terminal:
 while true; do adb shell am start -a \
 android.settings.panel.action.INTERNET_CONNECTIVITY; \
 sleep 0.1; done
Then press the back button while the screen is attempting to
display the fragment. There should be no Settings crash.
Change-Id: I4ca831d71a7221a7a4a62bb29e802f507ce5213c
 2020-02-27 15:47:38 +01: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
Automerger Merge Worker
9ac493094e Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
 2020-02-27 09:02:56 +00:00
Automerger Merge Worker
4a791935a6 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 
Change-Id: If2e85409f09d02876a496af93f76a2753e493da9
 2020-02-27 08:55:25 +00:00
TreeHugger Robot
2f492604e5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev 2020-02-27 08:41:57 +00:00
Arc Wang
9b69fd17bf [Wi-Fi] Fix data usage screen flash 1~2 times problem 
Data loaders should be destroyed at onPause or
the APP list will be updated twice.

Bug: 146841747
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Ic1b8ef443dd8e50777f1e3a16977add654748c54
 2020-02-27 16:18:04 +08:00
Tim Peng
3405c3dfa9 Change volume panel title from "Volume" to "Sound" 
Bug: 150337735
Test: manual
Change-Id: Icc457c2c1aae21282261549de47eeaf9c7219887
 2020-02-27 08:11:39 +00:00
timhypeng
95bd75e97b Append status to title for the disconnected Bluetooth device 
-Set gray color for status
-Remove status text in subtitle
-Add test cases

Bug: 149176483
Test: make -j42 RunSettingsRoboTests
Change-Id: I5ebb4e080f43d4c0fc00d87a4732ace76c2d806e
 2020-02-27 08:10:51 +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
7cef543f21 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 
Change-Id: I1201bf090cbf65a6aa1584c4078e7fdee11aef68
 2020-02-27 07:19:52 +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
Automerger Merge Worker
dbf643c5e9 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 
Change-Id: I1b6a7e48fdf94f62cd83899718b8e5c233e7e211
 2020-02-27 06:46:33 +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
71f6ccd61a Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 
Change-Id: Ie29d41ddd7387380708acdc0a313f000da280193
 2020-02-27 06:40:38 +00:00
Tim Peng
a87985c4ae Add dynamic group panel 
-Rename PanelCustomizedButtonCallback to PanelContentCallback
-Add onGroupChanged in PanelContentCallback
-Add test cases

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: I60888efbbd0fc2878467418e55c70887a9d3f405
 2020-02-27 06:29:01 +00:00
timhypeng
7dfd41f6b1 Add slice for dynamic grouping in output switcher 
-Add group operation slice to edit the group and do the volume adjustment
-Add grouping API in slice worker
-Add test cases

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: Ide0df5e3934bc8ac68aaa67fcbd6173a4454ac7f
 2020-02-27 06:28:15 +00:00
timhypeng
0abaafcf28 Add slice regist key for dynamic group 
Bug: 146813761
Test: build pass
Change-Id: Id620ec8c465cf5d7e8b1321f3a0d2a638ff6e7ac
 2020-02-27 06:27:59 +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
80d8c3bc83 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
Merged-In: I8147ec96569fa28867c088d6c36584aa344f40ed
 2020-02-27 12:33:16 +08: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
Automerger Merge Worker
2a428bbe48 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 
Change-Id: I1a1a8c59a254fea7267dcf1be555573cf8c7c62a
 2020-02-27 03:35:21 +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
02790d5285 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 
Change-Id: I833d625652995ee1d8434935772d825e3a5c1a3d
 2020-02-27 03:26:19 +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
Automerger Merge Worker
424965f608 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f 
Change-Id: Ie5eb8cbdc00528c59bfa9d972de1149dab40477c
 2020-02-27 02:29:23 +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