Commit Graph

62371 Commits

Author SHA1 Message Date
Arc Wang
31f04d1585 [Wi-Fi] Fix Wi-Fi broken tests
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
Merged-In: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
2020-03-20 14:07:13 +00:00
Bill Yi
9820335037 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I2bf62a5341fd621088c6f565803c0c9864e6dcbf
2020-03-20 07:02:23 -07: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
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
Tsung-Mao Fang
86ddac58a9 Ignore broken tests
Bug: 151913744
Bug: 151572330
Test: robo test
Change-Id: I59abca488d8cff2eb043ebe66aff9563cf3a01d4
Merged-In: I59abca488d8cff2eb043ebe66aff9563cf3a01d4
(cherry picked from commit ae8fbea47a)
2020-03-20 12:49:53 +00:00
Tsung-Mao Fang
036f83983d Ignore broken test cases
Test: Run robo test
Bug: 151572330
Change-Id: I2e2f0664d6e26827513632772e6b77c9f8b089a7
Merged-In: I2e2f0664d6e26827513632772e6b77c9f8b089a7
(cherry picked from commit d4ba7c1fa7)
2020-03-20 12:49:13 +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
Yi-Ling Chuang
7166ab38c2 Update summary of low battery tip in tests.
Bug: 144865404
Test: robotests
Change-Id: I4ec1966f765e7b44dc7affbcb46ba35c3fe6caea
2020-03-20 20:19:23 +08: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
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
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
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
TreeHugger Robot
1b626efa74 Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb
Change-Id: Iffd12985a04ff5d2b958c258bfee5eccc0561b56
2020-03-20 11:44:18 +00:00
TreeHugger Robot
3a9efed4ef Merge "Revise strings to up to date for tutorial improvement." into rvc-dev am: a5a629c7fb
Change-Id: I1eb8c117d3226c25d50f33100ec434f38923aec5
2020-03-20 11:43:57 +00:00
Junyu Lai
8e6aaf60bc Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 am: fbda2bf9fe
Change-Id: Iee4217dd836b1201470b5dd384abd34b64a80f0b
2020-03-20 11:37:01 +00:00
Bonian Chen
d03f6a14d7 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: a5f3b1142a
Change-Id: Iff9b950c50d9c2e384805a3fa3f83b4426c1b45d
2020-03-20 11:36:51 +00:00
Bonian Chen
6677d2b6b1 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: b6ff3cf826
Change-Id: I3eb8e8f8467ba673c2246f5277583e8094187a02
2020-03-20 11:36:34 +00:00
Junyu Lai
716d91c254 Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 2f60c6dddd am: 6cc97dc6aa
Change-Id: Ib8fe2feac663d94e9c29780cebe8d9588e60b4d3
2020-03-20 11:31:00 +00:00
Automerger Merge Worker
00a8e4dc70 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
Change-Id: I280f3d9af2c3ecd8e630d87aad59a95622470f80
2020-03-20 11:30:50 +00:00
Automerger Merge Worker
106cf460f0 Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d
Change-Id: I69ad6ab73bce7f5d39d6e34f8c489ab0a6a7bcbd
2020-03-20 11:30:36 +00:00
Bonian Chen
3d1b805340 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4 am: 6a6d143ad2
Change-Id: I38511a9a62ad29f73500b163748e67722910fa85
2020-03-20 11:30:23 +00:00
Bonian Chen
5ec5ac505a Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b
Change-Id: I52349d357ee81fd902adc80515e0b7f6197aa9f2
2020-03-20 11:30:14 +00:00
Bonian Chen
2f5b6f5350 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a
Change-Id: I4fcfd9ae20ea503e62c1042e8227e065a44b4713
2020-03-20 11:30:08 +00:00
TreeHugger Robot
a5a629c7fb Merge "Revise strings to up to date for tutorial improvement." into rvc-dev 2020-03-20 11:28:18 +00:00
Stanley Wang
ae4f8db19a Update Settings subtexts for R.
- Update subtexts
  "When screen is dark, it turns on for new notifications" &
  "Increased battery usage"

Fixes: 143267842
Test: Rebuilt rom and saw different screens.
Change-Id: I3c6d9f807da79037be90e1f19f0d0e0c82b79353
2020-03-20 11:20:14 +00:00
Junyu Lai
6cc97dc6aa Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 2f60c6dddd
Change-Id: Ifa142647b5c0371256dcc4b616ba44b31df2b624
2020-03-20 11:15:57 +00:00
Junyu Lai
fbda2bf9fe Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0
Change-Id: I07e230c076e002ec9a3bd960266f975f42a03fb1
2020-03-20 11:15:55 +00:00
Automerger Merge Worker
d7a9941088 Merge "Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7" into rvc-d1-dev-plus-aosp 2020-03-20 11:15:50 +00:00
Automerger Merge Worker
81299ce74d Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp 2020-03-20 11:15:47 +00:00
Bonian Chen
a5f3b1142a Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e
Change-Id: I8716a9f9e5009e6ed9d6072713e847368fbbdc77
2020-03-20 11:15:46 +00:00
Bonian Chen
49eaf9cc22 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: be71dbdda7
Change-Id: Id507ea34e3e6f787de3dfb91094f8270d4f26e62
2020-03-20 11:15:46 +00:00
Bonian Chen
b6ff3cf826 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf
Change-Id: I9f0ec77cdf231f81e7113fe2a033d4ed07ab94d6
2020-03-20 11:15:40 +00:00
Bonian Chen
6a6d143ad2 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: e495a049c4
Change-Id: I5eef63e860983ce026ef681ab2f1ce5500634777
2020-03-20 11:15:40 +00:00
Junyu Lai
b5b6a47ebc Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0
Change-Id: I55d1f78c8a0c90a1feef840865fdc9bb686da2cf
2020-03-20 11:15:34 +00:00
Bonian Chen
78b5db508b Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e
Change-Id: Id6591b6f9b6cb773cef09704440df379053f520a
2020-03-20 11:15:25 +00:00
Bonian Chen
e3d992094a Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf
Change-Id: Id182022f476a09a71f819f8ef0176fd99ef3545c
2020-03-20 11:15:19 +00:00