Commit Graph

62478 Commits

Author SHA1 Message Date
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
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
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
Bonian Chen
d874f73d40 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a am: 2f5b6f5350
Change-Id: I73692312ef9e266cddac3e6581798bfaeb23793c
2020-03-20 11:48:42 +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
Junyu Lai
8a293f07e0 Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
Change-Id: I7c62fbdc6177cfc4f32c221d413e73c9efe667d5
2020-03-20 11:08:58 +00:00
Junyu Lai
2f60c6dddd Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721
Change-Id: I68335aa9d56608b1ca2d0180d25cdbf077737697
2020-03-20 11:08:52 +00:00
Junyu Lai
040bfe3721 Merge "Adjust code for API council feedback" into rvc-dev 2020-03-20 11:03:47 +00:00