PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,352 Commits 1 Branch 0 Tags
f7c6541bdebebf87c3ef1b9310465cc8e375a07c
Commit Graph

62352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bonian Chen
be71dbdda7 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 
Change-Id: I218e2a34c62eaef6307475d1c5add31d3ff9ded4
 2020-03-20 11:01:52 +00:00
Bonian Chen
e495a049c4 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e 
Change-Id: Ia9cef50655182a53cae97115708490848974b78e
 2020-03-20 11:01:48 +00:00
Bonian Chen
1eb4c78a0e Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 
Change-Id: I15302d3dba68d4473a1e8204c947e13f13f1b346
 2020-03-20 11:01:38 +00:00
Bonian Chen
fc9bdd1fdf Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e 
Change-Id: Ic2c5c2d409176de58ba54dce107b5f94195c4c64
 2020-03-20 11:01:30 +00:00
Bonian Chen
26fb6c29c1 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev 2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev 2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99 [Settings] mSubId should not be overridden in 
TelephonyBasePreferenceController

mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
 2020-03-20 10:46:52 +00:00
menghanli
e367ce2951 Update R accessibility assets and strings (8/n) 
- Q behavior migration strings
- consistency for 1s or 3s
- Change the Shortcut from lock screen char limit

Bug: 148837311
Bug: 151635593
Test: Manual test
Change-Id: Icf6eae77e6dcbe55f53f896677de6513d0a33e7d
 2020-03-20 10:03:05 +00:00
Arc Wang
04854f8234 [Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings 
When WifiTracker2 callbacks to Wi-Fi Settings, should check if the
activity is finishing at first.

Bug: 151677440
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I95737eae3f67e6471c75ba845b57af2d721d5d37
 2020-03-20 18:02:02 +08:00
Yi-Ling Chuang
6950877b7a Fix ContextualAdaptiveSleepSliceTest 
ADAPTIVE_SLEEP has been moved from Settings.System to Settings.Secure
but the main logic hasn't synced with the change which leads to the
failure.

Fixes: 139319542
Test: robotests
Change-Id: I56f58cc3da5a4034e2bf2ed5a63ae3bc2fec2a21
 2020-03-20 17:29:03 +08:00
Peter_Liang
41f536df13 Revise strings to up to date for tutorial improvement. 
Bug: 148989018
Test: manual test
Change-Id: If6691f36277fa13b89f6305864fad30152a3cda9
 2020-03-20 15:22:30 +08:00
TreeHugger Robot
99cb033da9 Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: db153cfede am: 94975c3bd4 
Change-Id: Id44a2075e06b2897ba51c710fe1d8834141ec192
 2020-03-20 07:11:43 +00:00
TreeHugger Robot
d6adab084e Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: 084933ec19 am: 5970d8d5ec 
Change-Id: Ia56a07f8251fa49b5cb2990cd7d55a1f99c3d0cb
 2020-03-20 06:54:16 +00:00
TreeHugger Robot
94975c3bd4 Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: db153cfede 
Change-Id: I2e890d5d8046b5a4382241c28116890a000ccc91
 2020-03-20 06:53:44 +00:00
TreeHugger Robot
10c6b6b821 Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc am: 9999d6ba97 
Change-Id: I602a28703e29162c33fc319bee242cd24e0ce72e
 2020-03-20 06:53:32 +00:00
TreeHugger Robot
5970d8d5ec Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: 084933ec19 
Change-Id: I7fc95a6b5773bc8bb9c15df6881903261fb82c47
 2020-03-20 06:42:45 +00:00