Automerger Merge Worker
c3b12f302b
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5
...
Change-Id: I37e25bf184114eef9367c1a2844cbf6a7632ef01
2020-02-28 15:48:01 +00:00
Automerger Merge Worker
d5e10793e5
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207
...
Change-Id: I0f96de0f766c0eccfd55e0b4ed3a5341be8884f9
2020-02-28 15:34:12 +00:00
Shafik Nassar
3071821207
Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev
2020-02-28 15:30:58 +00:00
Automerger Merge Worker
20e3b25292
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history
Change-Id: I0937aa22f16d1356f89ca1f2b2d3d54d250da594
2020-02-28 06:54:10 +00:00
Automerger Merge Worker
7c636e673c
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history
Change-Id: I9496cc3e9dcf882a3f24dea801163e81a7100f9b
2020-02-28 06:28:16 +00:00
Automerger Merge Worker
fe066eab8d
[automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours
...
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history
Change-Id: Ie5c75f89bb59471650fbc4dbabfc85cf8f64b45e
2020-02-28 06:16:47 +00:00
TreeHugger Robot
594a5c71f5
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev
2020-02-28 06:04:46 +00:00
Automerger Merge Worker
3542ce579c
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1
...
Change-Id: I12634ec0b9ef0bce1b4491820b9f6c3ffaa2648e
2020-02-28 01:47:40 +00:00
Automerger Merge Worker
06c880fff2
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36
...
Change-Id: Iaffbda894d1ec07f467cb97d9dee0ccc5f500e10
2020-02-28 01:47:33 +00:00
Automerger Merge Worker
ed20d772f1
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
...
Change-Id: I96b3526fe5e7625c88d2f2d6ba48c9617032fd49
2020-02-28 01:35:36 +00:00
Automerger Merge Worker
763c41ca36
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
...
Change-Id: I06f10f54f84c58071694666a63e3e40dfb8f1ca9
2020-02-28 01:35:30 +00:00
TreeHugger Robot
dc4f004cc9
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev
2020-02-28 01:31:08 +00:00
TreeHugger Robot
51b06031e8
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev
2020-02-28 01:28:23 +00:00
Automerger Merge Worker
8715ccf4fb
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb
...
Change-Id: I4ca5c4f5ada31f40e1efb460366833afd06f97ce
2020-02-28 00:34:30 +00:00
Automerger Merge Worker
eb036399eb
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
...
Change-Id: I1c94629f0d01ada4c0a6444ab11aa685a7414f4b
2020-02-28 00:26:23 +00:00
Daniel Sandler
c1f6891ef3
Merge "Support updated rendering of conversation icons." into rvc-dev
2020-02-28 00:26:10 +00:00
Automerger Merge Worker
81a89153f0
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1
...
Change-Id: I6c648118389e8f6830ac939528d6f8c2609fa52c
2020-02-27 21:46:41 +00:00
Automerger Merge Worker
52be7605c1
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8
...
Change-Id: I76f743fcdd60e45fd5fc8084d86efd8005c33dbc
2020-02-27 21:34:25 +00:00
Julia Reynolds
7b9101e6a8
Merge "Unhide work profile icon" into rvc-dev
2020-02-27 21:27:08 +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
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
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
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
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
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
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
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
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
8c131f3213
Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: c023e758f7
...
Change-Id: Idbb5eae9bd8183c5889c97adf46093c04dd00b9f
2020-02-27 07:19:48 +00:00
Automerger Merge Worker
4278ed856f
Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7 am: 7367bb4f2f
...
Change-Id: I76b9651da7fe68dc79fb90b649768bd06fa9953f
2020-02-27 06:58:10 +00:00
Automerger Merge Worker
ee14b37f5f
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: Ib2e3d9bcf37586c92326d01ed0f5154b115f6d9f
2020-02-27 06:57:50 +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
7367bb4f2f
Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7
...
Change-Id: Ie2b32661845ac31ba856d11b6003879f7e919a4a
2020-02-27 06:46:31 +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
155fd0ce61
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: Id7354273a08808f7d59d2cee380392b8dce014bd
2020-02-27 06:40:40 +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
Automerger Merge Worker
20e9c2de4f
Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075 am: 7e33c3e968
...
Change-Id: I04972b7b23d68f0c7c7ff953d5d35b25c0ae8dd7
2020-02-27 05:56:07 +00:00
Automerger Merge Worker
7e33c3e968
Merge "Let footer with learn more become selectable" into rvc-dev am: 9408533075
...
Change-Id: I60fe94ad8b1f44c73857df0ad428b9c1fba3da2a
2020-02-27 05:38:54 +00:00
TreeHugger Robot
9408533075
Merge "Let footer with learn more become selectable" into rvc-dev
2020-02-27 05:27:26 +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
853f56ddf6
Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
...
Change-Id: I689b513ea5145a6eb1736a4db69c8087318537b2
2020-02-27 03:44:27 +00:00
Automerger Merge Worker
5f89cb0f4a
Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5
...
Change-Id: I47601b56b513cd239d4a96cadd9a79d804575421
2020-02-27 03:44:22 +00:00
Automerger Merge Worker
64f8f95178
Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
...
Change-Id: Ic9c13f75c7cfc12f6049ed671128f4fc8baa264a
2020-02-27 03:35:00 +00:00
TreeHugger Robot
d20ca89728
Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev
2020-02-27 03:29:20 +00:00