PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,726 Commits 1 Branch 0 Tags
1e734997b05b5ca5e51a256da307560e1c824db0
Commit Graph

61726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TreeHugger Robot
db153cfede Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc 
Change-Id: Ic4a9281f40db77b91878fbf6deaaf4869fadc83c
 2020-03-20 06:42:41 +00:00
TreeHugger Robot
9999d6ba97 Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 am: ea1c86bfdc 
Change-Id: I47c1605035ddb4302e2c469addef28f293478cb7
 2020-03-20 06:42:11 +00:00
TreeHugger Robot
084933ec19 Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 
Change-Id: Id398fce942c15b7895bc3b30fca0bc0e8a259ca3
 2020-03-20 06:25:02 +00:00
TreeHugger Robot
ea1c86bfdc Merge "Update the icon of security IA." into rvc-dev am: 750ff89856 
Change-Id: Iaae4b0e5953fc8846450703809185136db28e3d1
 2020-03-20 06:24:34 +00:00
TreeHugger Robot
750ff89856 Merge "Update the icon of security IA." into rvc-dev 2020-03-20 06:11:06 +00:00
Daniel Bright
f94e4db5b0 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 940de2cb19 am: a87d9fcf31 
Change-Id: I2e713bcb8bf3d06fbcf90af533543805984206b8
 2020-03-20 05:46:11 +00:00
Daniel Bright
159063b68e Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: d46bf256b9 am: 36ff5bdc4a 
Change-Id: I405a1a69811c565f067b040abf7f0e90fedc088d
 2020-03-20 05:45:49 +00:00
Sooraj Sasindran
9e8c20b6e6 Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: 5d42a76fcd am: 9885fd223a 
Change-Id: Ie88d15410497ba03f7f02abb856d0e5f65e9d69d
 2020-03-20 05:45:47 +00:00
Goven Liu
dea5b67b8f Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: bb21d59c96 am: e909a1def8 
Change-Id: I3374e7488fd1402e129471936d007c3138059c0b
 2020-03-20 05:45:21 +00:00
Daniel Bright
a87d9fcf31 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 940de2cb19 
Change-Id: Icd738ca81fb418cfbc4ccf90f5273dd91193f864
 2020-03-20 05:41:58 +00:00
Daniel Bright
dd03c05c8d Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 am: 813d114d86 
Change-Id: Ib341ab90b25d4763b695d929b1dbb2e2a4945e7d
 2020-03-20 05:35:45 +00:00
Bonian Chen
4a49f426fb [Settings] Avoid from accessing IMS with invalid subscription id 
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
 2020-03-20 13:31:35 +08:00
Daniel Bright
940de2cb19 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 
Change-Id: I09163a0c1da1169c88352a943684b4d7c8a52027
 2020-03-20 05:29:44 +00:00
Daniel Bright
813d114d86 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: aaf82799c7 
Change-Id: I17504ffdfeba4ce1458310501c7f8c6dea2a747f
 2020-03-20 05:29:25 +00:00
Daniel Bright
5e0c8e145f Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: 7178e1070b am: 087f54d0e6 
Change-Id: Id141a3dfea57f10f919fe2c24d3c0c5538816fe3
 2020-03-20 05:27:03 +00:00
Daniel Bright
c90b1c628f Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: dc3ca505f8 am: dee99a5407 
Change-Id: I134f88308ae2a82af63ca387806da81a091b9ebd
 2020-03-20 05:26:30 +00:00
Sooraj Sasindran
788ce5e242 Revert "access system resources with android.R package" am: 253ba4f3ef am: 9c35cfa688 am: 941b518e7d 
Change-Id: I7558cc2ce4d29aad6e1b7950062efbe144306fd0
 2020-03-20 05:26:26 +00:00
Daniel Bright
36ff5bdc4a Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: d46bf256b9 
Change-Id: I5695a8446136721e47cf9c8a6f708c68d8a90fa9
 2020-03-20 05:26:18 +00:00
Sooraj Sasindran
9885fd223a Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: 5d42a76fcd 
Change-Id: Ie2671eebc7f57108d650908989b737ca46ca9d36
 2020-03-20 05:26:15 +00:00
Goven Liu
4691f47ff9 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: 1853ed32df am: c96a4f2bd4 
Change-Id: I7c71e2ccd27f1c8239fcbc895152fccbcbbea2a5
 2020-03-20 05:25:59 +00:00
Goven Liu
e909a1def8 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: bb21d59c96 
Change-Id: Ib9c3babc5eba602d488ea2a6117008be9d50d96d
 2020-03-20 05:25:46 +00:00
Daniel Bright
170541e854 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 am: da8d46bdf9 
Change-Id: Iddffc8ea840094a6ddbc0f7cf9069cb8494d6c07
 2020-03-20 05:23:26 +00:00