TreeHugger Robot
00c9afb0b8
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5 am: ddca3962bc am: 0cef60f1a6 am: 4fc660f003
...
Change-Id: I310ef789228b565d34a28255947f615e7ec61081
2020-03-20 15:38:49 +00:00
TreeHugger Robot
575fec5d88
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 40a6857244 am: 6a1121a45f am: 6916e66057
...
Change-Id: I93dfa0112694069410e6a5f4699da5ea33a65c76
2020-03-20 15:38:12 +00:00
TreeHugger Robot
1e89647ccf
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5 am: c6a759919c am: 6d9885a215
...
Change-Id: I0d8df8407544f946256db5ced941f76fade701d4
2020-03-20 15:37:41 +00:00
TreeHugger Robot
4fc660f003
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5 am: ddca3962bc am: 0cef60f1a6
...
Change-Id: I84da4acfd329202dc9f8ae0d06f6ae1cfe13f591
2020-03-20 15:37:28 +00:00
TreeHugger Robot
6916e66057
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 40a6857244 am: 6a1121a45f
...
Change-Id: I91adac3b20560d383ae31ba21d68918e41cf3275
2020-03-20 15:23:12 +00:00
TreeHugger Robot
6d9885a215
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5 am: c6a759919c
...
Change-Id: Ieedd7282c0d94e9431a1cbe0d5c0f4d0f5fd2cd9
2020-03-20 15:22:42 +00:00
TreeHugger Robot
0cef60f1a6
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5 am: ddca3962bc
...
Change-Id: I706159264be1db3896ae4d0d435051bf60b53e7b
2020-03-20 15:22:11 +00:00
TreeHugger Robot
6a1121a45f
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 40a6857244
...
Change-Id: I1f20648fa683c2786c72559195a521cee0b203bb
2020-03-20 15:07:58 +00:00
TreeHugger Robot
ddca3962bc
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5
...
Change-Id: Id59db56962357ace2eb20e30b7ceb13a53d9e388
2020-03-20 15:07:44 +00:00
Joshua Duong
04bc02223e
Merge changes from topic "adbwifi-bugs"
...
* changes:
Add toast error message for no WiFi on wireless debugging.
Add visibility control to ADB QR code preference.
2020-03-20 15:07:14 +00:00
TreeHugger Robot
c6a759919c
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad am: 7f3bc7d7f5
...
Change-Id: I3f1403eee5f805b8e60d8186c0e3ced7a2acca9f
2020-03-20 15:07:05 +00:00
Joshua Duong
564f6ba770
Add toast error message for no WiFi on wireless debugging.
...
Show a toast to connect to a WiFi network when the user tries to
enable wireless debugging while not connected to any Wi-Fi network.
Bug: 150139061
Bug: 149843499
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest
Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5
Exempt-From-Owner-Approval: LGTM
2020-03-20 15:05:28 +00:00
TreeHugger Robot
7f3bc7d7f5
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad
...
Change-Id: I8529b5e819bf4b6d87ab3b8f78c3563b8c10a830
2020-03-20 14:55:01 +00:00
TreeHugger Robot
40a6857244
Merge "Enable Night Light preference searchable" into rvc-dev am: 1b0d27dbad
...
Change-Id: I28551ca6eda3fa50732838aff567ecaa04f2745a
2020-03-20 14:54:48 +00:00
TreeHugger Robot
1b0d27dbad
Merge "Enable Night Light preference searchable" into rvc-dev
2020-03-20 14:40:25 +00:00
Menghan Li
99a3ae966a
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 7901e49ef2 am: 258eb64659 am: a54d1632b9
...
Change-Id: Icf671c522263883619c020bfc74e1da84b7d5380
2020-03-20 13:32:56 +00:00
Menghan Li
a54d1632b9
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 7901e49ef2 am: 258eb64659
...
Change-Id: I6b9c7e564837fee61b19e1454c086679a9437b7b
2020-03-20 13:32:49 +00:00
Menghan Li
0f094d9d2d
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 9abfb90214 am: 296e0d540c am: 567ea6362e
...
Change-Id: I33fb7100974ac8015180aa2a30cfcdd324de2da5
2020-03-20 13:32:49 +00:00
Menghan Li
3584ad62e5
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 4199c44cb0 am: 7462ad2d4c
...
Change-Id: I92d01c4aa0ea94287d8576be47b8086bfbb06cff
2020-03-20 13:32:38 +00:00
Menghan Li
567ea6362e
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 9abfb90214 am: 296e0d540c
...
Change-Id: Ib92fcab1692e7dfdaf26cd8e74eeec62bbe6db05
2020-03-20 13:22:26 +00:00
Menghan Li
7462ad2d4c
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 4199c44cb0
...
Change-Id: I5b865b8e606330100e0d2e9799ba30aab42cd1ff
2020-03-20 13:22:19 +00:00
Menghan Li
258eb64659
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd am: 7901e49ef2
...
Change-Id: I6920b26b9b1093561a761c01b84c13bb37f5a00c
2020-03-20 13:22:18 +00:00
Menghan Li
296e0d540c
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 9abfb90214
...
Change-Id: Ie3c3ab884e0fc9faed6627e19bc5beece208ae6c
2020-03-20 13:06:17 +00:00
Menghan Li
7901e49ef2
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd
...
Change-Id: I8615cd4c88929e4dd0fde9bfc12085cf2d90a989
2020-03-20 13:06:16 +00:00
Menghan Li
4199c44cb0
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019 am: 135bab49bd
...
Change-Id: Ib5dcdc90d930e27cecb554f12167999f997f0f8b
2020-03-20 13:05:57 +00:00
Menghan Li
9abfb90214
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019
...
Change-Id: Ib0e2b619702d3a5b1ee6ef9e5938066a672586d0
2020-03-20 12:53:38 +00:00
Menghan Li
135bab49bd
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev am: 9eb0906019
...
Change-Id: I6184173dd956c7fd2eb3f0fe57a5aef6b14cf4c3
2020-03-20 12:53:19 +00:00
TreeHugger Robot
20c6af23d7
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: f72de7d1c0 am: 1572476ba9 am: 9e21098fc1
...
Change-Id: If739ca291332d71f103069f080931227706fe871
2020-03-20 12:41:12 +00:00
TreeHugger Robot
5ffd8fed9b
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 1b626efa74 am: 67d2c67330 am: 156250fd64
...
Change-Id: I15528d868f21f0fe674a67fe359bbf034361c402
2020-03-20 12:41:07 +00:00
TreeHugger Robot
52257685e8
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: a0783d38b2 am: f4e9e0394b
...
Change-Id: I8af6876ca8dd052ac4dd74cc20faa725b33e925d
2020-03-20 12:40:59 +00:00
Menghan Li
9eb0906019
Merge "Update R accessibility assets and strings (8/n)" into rvc-dev
2020-03-20 12:36:29 +00:00
TreeHugger Robot
9e21098fc1
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: f72de7d1c0 am: 1572476ba9
...
Change-Id: I36390c8a821ea14d122bb9029c7fb2c63e7d37cb
2020-03-20 12:33:57 +00:00
TreeHugger Robot
156250fd64
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 1b626efa74 am: 67d2c67330
...
Change-Id: If5828cc39d2ccd9df9fb19964e4f554f4d90e44e
2020-03-20 12:22:35 +00:00
TreeHugger Robot
f4e9e0394b
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: a0783d38b2
...
Change-Id: Ie8b7722d5d5eaf852a35cee9c8feaeb713b62894
2020-03-20 12:22:29 +00:00
TreeHugger Robot
1572476ba9
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef am: f72de7d1c0
...
Change-Id: I27a61ede192718593dce3c4fa933fa968e48a510
2020-03-20 12:22:20 +00:00
Yanting Yang
cf837e9ea8
Enable Night Light preference searchable
...
When the searchable attribute of preference is false, we do not collect
it to Settings Search, therefore, we can not get its sitemap relation
from index data.
Since we do not index the NightDisplayPreference, it caused the sitemap
relation loss. The relevant night light preferences can not map to
the correct parent page, Display page.
In order to fix the breadcrumb and grouping problem, remove the
searchable="false" of NightDisplayPreference to enable the indexing
again.
Bug: 151206664
Test: visual
Change-Id: Ia4f82b29cfe4f78ae55b20dad0356ac56b735307
2020-03-20 20:09:41 +08:00
TreeHugger Robot
67d2c67330
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 1b626efa74
...
Change-Id: I6d001a98a776d2ee0091d73f3f04db0628773fd2
2020-03-20 12:06:23 +00:00
TreeHugger Robot
f72de7d1c0
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef
...
Change-Id: I1c44a3faeab8b568b7b392df8d490698e963fda3
2020-03-20 12:06:16 +00:00
TreeHugger Robot
a0783d38b2
Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb am: 3a9efed4ef
...
Change-Id: I1160c7f6cac33a60b626a77c067403a000612687
2020-03-20 12:06:00 +00:00
Junyu Lai
daeafbcb65
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 am: fbda2bf9fe am: 8e6aaf60bc am: 36f05339f6
...
Change-Id: Id159a2f174db5ad56be775cbf533c91b8eef8679
2020-03-20 11:52:54 +00:00
Bonian Chen
339e5b0eee
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a am: d03f6a14d7 am: f528f54591
...
Change-Id: I72e070350e1b0ceccb5f36178c83ac529fd4251b
2020-03-20 11:52:35 +00:00
Bonian Chen
51524ab8d5
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: b6ff3cf826 am: 6677d2b6b1 am: daae7ecee6
...
Change-Id: Id6ca9dc7c8f4efa29f2431c1c486055fba285d1e
2020-03-20 11:51:46 +00:00
Junyu Lai
f7f9b5e663
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 2f60c6dddd am: 6cc97dc6aa am: 716d91c254
...
Change-Id: Ic84ce14cff6793b410b715a1f269f7de023b9ef5
2020-03-20 11:50:32 +00:00
Automerger Merge Worker
86b026be4e
Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp am: d7a9941088 am: 00a8e4dc70
...
Change-Id: Ia358b090bf49654d56ea5c9232737e1902326b32
2020-03-20 11:50:19 +00:00
Junyu Lai
36f05339f6
Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 am: fbda2bf9fe am: 8e6aaf60bc
...
Change-Id: Ia244c2bf9f771e4b02e60cdfc3d90fda9dd0ce22
2020-03-20 11:49:46 +00:00
Automerger Merge Worker
6fad8f62f6
Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d am: 106cf460f0
...
Change-Id: I9518bc4eb9dc23aa34eae082e5426cae6a6ca4e3
2020-03-20 11:49:39 +00:00
Bonian Chen
f528f54591
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a am: d03f6a14d7
...
Change-Id: Ic6303af218eeb87bfa8f26d469464ccf71c2d22a
2020-03-20 11:49:33 +00:00
Bonian Chen
4400503dd8
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4 am: 6a6d143ad2 am: 3d1b805340
...
Change-Id: Ia7dffb5cbab72a827067c9673a8fadc85ac8cb64
2020-03-20 11:49:26 +00:00
Bonian Chen
e2e597c538
Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b am: 5ec5ac505a
...
Change-Id: I95b460761888220716bd2000976a01bc3ef92524
2020-03-20 11:49:11 +00:00
Bonian Chen
daae7ecee6
Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: b6ff3cf826 am: 6677d2b6b1
...
Change-Id: I30786ba35d6795ea190cfab54baf70ef63d1c7ed
2020-03-20 11:48:53 +00:00
