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
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
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
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
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
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
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
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
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
d3bf448f40
Merge "Call releaseSession() when "stop casting" button click" into rvc-dev am: 63105b36a7
am: dbf643c5e9
...
Change-Id: Id284fb7b4c2907549132b67d2970e2cd7bfa715d
2020-02-27 06:58:09 +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
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