Automerger Merge Worker
5ebc70225e
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: d6b261c49e
...
Change-Id: I7116d882593e821cd36dccad83a274356f55e68f
2020-02-27 16:18:44 +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
Julia Reynolds
323e9315d3
Unhide work profile icon
...
Test: Manual, dismiss work profile notif, look at history
Fixes: 150361222
Change-Id: I7bf17b400f084f5e1a0763c2b6d1ebe69c78b9c2
2020-02-27 11:12:46 -05:00
Automerger Merge Worker
54933e3bb5
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1
...
Change-Id: I69ec23901a68268f03fdb718a4ca02781a34e1ac
2020-02-27 15:58:57 +00:00
Automerger Merge Worker
07d2bbaa8a
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4
...
Change-Id: Ibc384b968d9821763dffb077bc60d5a2cb36eb08
2020-02-27 15:58:54 +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
Automerger Merge Worker
15dbc718e1
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0
...
Change-Id: I6db41bb009930b62191d6066bfc4fcb958b66b2d
2020-02-27 15:49:26 +00:00
James Lin
0c3bd003d0
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev
2020-02-27 15:37:22 +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
Automerger Merge Worker
7ed34c1e6d
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 0c94f7f87e am: ac3216adc3
...
Change-Id: Ia37b7553ce58a08819e29cb2a098f7a4e19908c6
2020-02-27 12:14:50 +00:00
Automerger Merge Worker
55a6b61549
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e am: 594f014fa3 am: 226be880c9
...
Change-Id: I04597f2721a8ddf3fb014b0425a46927e49f5092
2020-02-27 12:14:44 +00:00
Automerger Merge Worker
501870039b
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 764a7eb922 am: 8c8c9d7bfc
...
Change-Id: I731e2cbb4da3ad88c999a0f0bd07bdb8b4ace90c
2020-02-27 12:14:34 +00:00
Automerger Merge Worker
ac3216adc3
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 0c94f7f87e
...
Change-Id: Ib2383d97abb176dd2437d543f8d149a7114a34e6
2020-02-27 12:02:32 +00:00
Automerger Merge Worker
226be880c9
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e am: 594f014fa3
...
Change-Id: I2aaa8009cdf337be63c50e1b8d51c641f8c62ef2
2020-02-27 12:02:28 +00:00
Automerger Merge Worker
8c8c9d7bfc
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 764a7eb922
...
Change-Id: I871ff8341511d56977f1927fd969a6201cc1ce31
2020-02-27 12:02:19 +00:00
Automerger Merge Worker
0c94f7f87e
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282
...
Change-Id: Iec4002f07c246c21d0796652a30ce22e86c83d7a
2020-02-27 11:47:56 +00:00
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
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
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
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
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
