Commit Graph

59855 Commits

Author SHA1 Message Date
Automerger Merge Worker
594f014fa3 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e
Change-Id: Ic4f7a701b016948d73fdf111824bf08e63443187
2020-02-27 11:47:56 +00:00
Automerger Merge Worker
764a7eb922 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282
Change-Id: I4b276c003efe8e49f37bda5b58c91d196c275f0a
2020-02-27 11:47:40 +00:00
Automerger Merge Worker
d2750a8d0e Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde
Change-Id: I4f82e4de83cc7982ea791d65dd8a97fc882f13a9
2020-02-27 11:35:52 +00:00
Automerger Merge Worker
5c5d6ce282 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde
Change-Id: If8492d184dad2daa43dcf5e39206cb029dad72e3
2020-02-27 11:35:46 +00:00
TreeHugger Robot
4e3b62adde Merge "Minor change to cross profile setting subtext." into rvc-dev 2020-02-27 11:17:18 +00:00
Arc Wang
a001e42d7b [Wi-Fi] Fix hint text color contrast problem in 'Add networks'
To raise hint text color, set android:attr/textColorSecondary
to android:textColorHint.

Bug: 146908018
Test: accessibility scanner
Change-Id: Id2525c1a0fc0b3f95298d493e2dc69b91aa13d77
2020-02-27 18:36:20 +08: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
16dd523ee7 [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours am: 6af789dbd2 -s ours am: 49ec2b321b -s ours am: 76479af125 -s ours
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: I02ac692a97e5d98339c27804ed5d700d44905fb8
2020-02-27 09:51:44 +00:00
Automerger Merge Worker
76479af125 [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours am: 6af789dbd2 -s ours am: 49ec2b321b -s ours
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: I3d1fc2497a9dc1432c54fc99a06f6e21a531727e
2020-02-27 09:38:06 +00:00
Automerger Merge Worker
222fbfb9c8 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 am: 6820c6e8f5 am: 2e680226fa
Change-Id: Idbc7dc61f22b268e1499b87538b96c18707b3ce3
2020-02-27 09:32:22 +00:00
Automerger Merge Worker
ca63e31b53 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 4a791935a6 am: 6c38423605 am: 3b6be20812
Change-Id: I89a0b6c86830d824b40b47a37c61d2ef07ba8f97
2020-02-27 09:32:14 +00: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
49ec2b321b [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours am: 6af789dbd2 -s ours
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: If29361d1e382d652bfc72a229fd7b63e1bd4960f
2020-02-27 09:26:38 +00:00
Automerger Merge Worker
2e680226fa Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 am: 6820c6e8f5
Change-Id: I80ac06259ee7f5d13ac31f806858239509a83382
2020-02-27 09:20:54 +00:00
Automerger Merge Worker
3b6be20812 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 4a791935a6 am: 6c38423605
Change-Id: I6a4580c7c8c67f679d30195a9393dd48263c7f86
2020-02-27 09:20:48 +00:00
Automerger Merge Worker
e30e500acb Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 am: 1c4f76ec18
Change-Id: I93e202733dd35bbe87e4bdfa55c34997d159030a
2020-02-27 09:20:42 +00:00
Automerger Merge Worker
6af789dbd2 [automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee is in history

Change-Id: Ia028c322526bcaf784be278b8097767f5019066d
2020-02-27 09:12:29 +00:00
Automerger Merge Worker
6c38423605 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 4a791935a6
Change-Id: Id1c73a5a0faab9cfa7089cee7be81a35325eefbe
2020-02-27 09:08:13 +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
6820c6e8f5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866
Change-Id: I322771c42e3890b57e3fa4b72f56023c0096c875
2020-02-27 09:07:54 +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
Automerger Merge Worker
554b10a866 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
Change-Id: I4947e650122998b51413fc81397a6728f9ef837b
2020-02-27 08:55:13 +00:00
Treehugger Robot
cd4ca97828 Merge "Fixes ApnEditor not restoring previous UI" 2020-02-27 08:50:37 +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
b21cd84f15 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: dc8597abc0 am: 77a7e01609
Change-Id: I1da830504d0898310e56b1603438ab3c88bb6537
2020-02-27 07:59:34 +00:00
Automerger Merge Worker
9bfa992d02 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 7cef543f21 am: 26a84c1a46 am: afeb69eefb
Change-Id: I8ff142a1508d39741bd6a47ff5d9f2670cc14ce3
2020-02-27 07:59:27 +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
77a7e01609 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: dc8597abc0
Change-Id: Ic8cc77addb6aaa871f4137ebd32586fbfbef18de
2020-02-27 07:47:04 +00:00
Automerger Merge Worker
afeb69eefb Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 7cef543f21 am: 26a84c1a46
Change-Id: If6daeafa9edb7504f779c9608c16c6be7da751be
2020-02-27 07:47:00 +00:00
Automerger Merge Worker
1d6fcee05e Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213 am: d7ba7964c1
Change-Id: Id74d916099278dc9226db3b6381d400e93e7be10
2020-02-27 07:46:55 +00:00
Automerger Merge Worker
db42c55c1e Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: dbf643c5e9 am: d3bf448f40 am: 7ac59cda41
Change-Id: I4362c4a76ef27fb4434894adb7b9225518105028
2020-02-27 07:37:03 +00:00
Automerger Merge Worker
43da96f713 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 07c3fd058f am: c1fa4a9889
Change-Id: I52c6cbd7a79f9efc46a680b5257f58fbdd216f07
2020-02-27 07:36:48 +00:00
Automerger Merge Worker
6e6c2c617f [automerger skipped] Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp am: 8e478b7247 am: 8a9b719705 -s ours
am skip reason: Change-Id I011b52fd25ca9ad48be3afcdabd9bdd443cd121d with SHA-1 f64e2b3d10 is in history

Change-Id: I9224e35baa94744e776d31090f2315ec4214301e
2020-02-27 07:36:19 +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
b29142bd67 [automerger skipped] 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 am: ee14b37f5f am: 31826aa648 -s ours
am skip reason: Change-Id I011b52fd25ca9ad48be3afcdabd9bdd443cd121d with SHA-1 f64e2b3d10 is in history

Change-Id: I6d0b2cf15bbbeae5f0060cb92799c243119199be
2020-02-27 07:35:47 +00:00
Automerger Merge Worker
e22c2757c4 [automerger skipped] 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 am: c586f9f7be am: 2d8cc7d8d0 -s ours
am skip reason: Change-Id I011b52fd25ca9ad48be3afcdabd9bdd443cd121d with SHA-1 f64e2b3d10 is in history

Change-Id: I3b42596298f0dd2b0093d1e123dbc2c0aa6eedf7
2020-02-27 07:35:09 +00:00
Automerger Merge Worker
26a84c1a46 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 7cef543f21
Change-Id: Idce28e518850dfe686b21ce5eef34e334a3cd75a
2020-02-27 07:34:54 +00:00
Automerger Merge Worker
dc8597abc0 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7 am: 8c131f3213
Change-Id: I5553443a9b25d1f3e32121d51d0fb3347501cdbc
2020-02-27 07:34:40 +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
7ac59cda41 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: dbf643c5e9 am: d3bf448f40
Change-Id: I76c3843c64190d7633844ae7ff53c8c3e55fb042
2020-02-27 07:21:28 +00:00
Automerger Merge Worker
c1fa4a9889 Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f am: 07c3fd058f
Change-Id: I8320bf776525176aadd9b5afc5d6899fe7ed0fd2
2020-02-27 07:21:00 +00:00
Automerger Merge Worker
8a9b719705 Merge "Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 am: 23d5e32943 am: 71f6ccd61a" into rvc-d1-dev-plus-aosp am: 8e478b7247
Change-Id: I03c110fb906f8d91da134c74bee5f3bfc6c83621
2020-02-27 07:20:43 +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
31826aa648 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 am: ee14b37f5f
Change-Id: I7b0f40443abcbeb4c1155908f0a51ba15034493f
2020-02-27 07:20:08 +00:00
Automerger Merge Worker
2d8cc7d8d0 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 am: c586f9f7be
Change-Id: I0a7eeaf2e0c1d2625b2d43aed0cb5ccaad8b82c9
2020-02-27 07:19:58 +00:00