PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,275 Commits 1 Branch 0 Tags
c8cb51a422a54138da106aedeb27ba3a31ae1484
Commit Graph

60275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
040bfe3721 Merge "Adjust code for API council feedback" into rvc-dev 2020-03-20 11:03:47 +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
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
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
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
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
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
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
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
aaf82799c7 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 
Change-Id: I334f1df41065c05683484e9f04b68d285b46b7f5
 2020-03-20 05:16:31 +00:00
Daniel Bright
d46bf256b9 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04 
Change-Id: I156e9bfc666975228e9eae6e641fb3c8739f9118
 2020-03-20 05:09:19 +00:00
Sooraj Sasindran
5d42a76fcd Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d 
Change-Id: I2bb5796b7c181d68a8c1d6a4cba3201162930a02
 2020-03-20 05:09:17 +00:00
Goven Liu
bb21d59c96 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 
Change-Id: I9bafbacf24f2d26446e043fcc9952dde9eaaa6ba
 2020-03-20 05:08:58 +00:00
Daniel Bright
da2fe00a04 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f 
Change-Id: Ifb96ebf14d46e5c07a3cc7b96bb067f55b129b3f
 2020-03-20 05:02:02 +00:00
Sooraj Sasindran
2628af114d Revert "access system resources with android.R package" am: 253ba4f3ef 
Change-Id: Idf5eee8350df4aaa7ea37f85677b315b35c56028
 2020-03-20 05:01:58 +00:00
Daniel Bright
b5e5aa9ef2 Merge "Revert "access system resources with android.R package"" into rvc-dev 2020-03-20 04:57:43 +00:00
Daniel Bright
6249dfbd9f Merge "Revert "access system resources with android.R package"" into rvc-dev 2020-03-20 04:57:43 +00:00
Goven Liu
a3e9660230 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 
Change-Id: I35f128811a9d4e480ada35a99f1fa4b90c243834
 2020-03-20 04:56:52 +00:00
Goven Liu
b626a602c9 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev 2020-03-20 04:54:46 +00:00
TreeHugger Robot
75062d0a6a Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918 am: 1bea826cad 
Change-Id: I1c3db45282066d8f10fbca84f2719d8e01d94581
 2020-03-20 04:25:19 +00:00
TreeHugger Robot
1bea826cad Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918 
Change-Id: If87953e41319b8660dab392f339092c30ce7f6f6
 2020-03-20 04:13:50 +00:00
TreeHugger Robot
303eabfc93 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: e04ffe1aa1 -s ours am: 779a069520 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: Ie0acf11792ad4a43b510f8cabd1730047690e354
 2020-03-20 04:02:16 +00:00
TreeHugger Robot
bf82eab918 Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb 
Change-Id: Idb9f81cf4621e1d62fa182bdfafbfdb105390ff8
 2020-03-20 04:01:46 +00:00
TreeHugger Robot
779a069520 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: e04ffe1aa1 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: If21132afaf33cb00d178be19fa63b4d1b3951866
 2020-03-20 03:43:31 +00:00
TreeHugger Robot
b33c16cacb Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-20 03:40:00 +00:00
Yi-Ling Chuang
d44ceb95cc Update the icon of security IA. 
Fixes: 140556928
Test: rebuild and check the icon on the homepage
Change-Id: I211ea9f57910943a75d8a98c6d88ce99018debfe
 2020-03-20 11:36:18 +08:00
TreeHugger Robot
e04ffe1aa1 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: Id0c124c57c782835535df26c5eee251af97dd12b
 2020-03-20 03:30:26 +00:00
TreeHugger Robot
dc1f295a59 [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours 
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c is in history

Change-Id: I279a6e1584a26219a1b3b26a0054ebb9728b498e
 2020-03-20 03:19:10 +00:00
TreeHugger Robot
bdffe50d16 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 am: e3e2309149 
Change-Id: I74925d6ec263360f9ca6c9cc90cebc7c1480a97f
 2020-03-20 03:02:33 +00:00
TreeHugger Robot
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
TreeHugger Robot
e3e2309149 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 
Change-Id: I88956b7fca1e11e434b3f19cf8b29c313834e220
 2020-03-20 02:38:48 +00:00
TreeHugger Robot
23df2cf9c9 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 
Change-Id: Ic0b09f6cd825e413e87b06434bfdeb65e66225c3
 2020-03-20 02:18:53 +00:00
TreeHugger Robot
6e032c607e Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 am: 221d385fea 
Change-Id: Ia210245ea35453ff8970073f89f5f56e66e4a573
 2020-03-20 02:15:46 +00:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package" 
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
 2020-03-20 01:37:47 +00:00
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package" 
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
 2020-03-20 01:37:30 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00
TreeHugger Robot
221d385fea Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 
Change-Id: I122499b6d4bccf7ece08039abc02a1a5dedc9e9a
 2020-03-20 01:09:41 +00:00
TreeHugger Robot
70215248d1 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 
Change-Id: I5c210eec0fe7d89e8117ea5c21d4656e42cba522
 2020-03-20 00:51:01 +00:00
TreeHugger Robot
db468353e0 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev 2020-03-20 00:41:34 +00:00