Commit Graph

60795 Commits

Author SHA1 Message Date
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
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
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
Sanghee Kim
24565c1b83 Fixed NullPointerException
1. only one sim insertion.
2. sim removal in sim card lock setting menu.

Additionally, removed unnecessary code.

Test: manual

Change-Id: I5710b9c313d6e0b7c011a12e0179a4d5a4f7e580
Signed-off-by: Sanghee Kim <haya93@samsung.com>
2020-03-20 14:39:44 +09: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
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
087f54d0e6 Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2 am: 7178e1070b
Change-Id: I397fc8e12f74e8ecfd72dad11f0ae5a5175dae01
2020-03-20 05:19:18 +00:00
Daniel Bright
dee99a5407 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: dc3ca505f8
Change-Id: Ic9c14f6d20855a38211f08dc33b320f496fd4f2e
2020-03-20 05:18:49 +00:00
Sooraj Sasindran
941b518e7d Revert "access system resources with android.R package" am: 253ba4f3ef am: 9c35cfa688
Change-Id: I6e0e6f3c8df4a7a5b7ddb59f2ca425eb9eb49352
2020-03-20 05:18:44 +00:00
Goven Liu
c96a4f2bd4 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: 1853ed32df
Change-Id: Ifcd7939373d7f1b880959816b7bfb219ceb9df63
2020-03-20 05:18:25 +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
7178e1070b Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2
Change-Id: I7cb01e6980193d170eaf0438a47aa9feaf68bcaf
2020-03-20 05:16:29 +00:00
Daniel Bright
da8d46bdf9 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f am: da2fe00a04
Change-Id: I3eae26f6789f463ae82150d2b950c90cfc8f7c61
2020-03-20 05:09:29 +00:00
Sooraj Sasindran
cb5953d272 Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d
Change-Id: Ib765d1e4f0485cb3f4d42d659633e1d91c9d2735
2020-03-20 05:09:26 +00:00
Goven Liu
1db751a1d3 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230
Change-Id: Ia16dae9b6da10974921566f8299eb4b85e128a1d
2020-03-20 05:08:57 +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
dc3ca505f8 Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f
Change-Id: I115213610426564c133ddb0ca185f4273ceac242
2020-03-20 04:58:44 +00:00
Sooraj Sasindran
9c35cfa688 Revert "access system resources with android.R package" am: 253ba4f3ef
Change-Id: I78a68e8eef3b3cee9911cb89a9bd09ce83020357
2020-03-20 04:58:39 +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
1853ed32df Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
Change-Id: Idce71a7d430a0d6da7fb8fa821e3853e0c2a9921
2020-03-20 04:57:38 +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
c38b757ae2 Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: d5f0f2d8c8
Change-Id: I43810592e434d751f33d3c89175f835c3be264b5
2020-03-20 04:20:14 +00:00
TreeHugger Robot
33a8eb6d3a Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb am: bf82eab918
Change-Id: Ifecd2010f27b8ba5863a25adfae513b5b347b5c2
2020-03-20 04:13:15 +00:00
TreeHugger Robot
d5f0f2d8c8 Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
Change-Id: Id86e0b84a70cfbeb2e96590b2d90d6059b94f37b
2020-03-20 04:02:14 +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
d01a8626ee [automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d -s ours am: dc1f295a59 -s ours am: f28bf18e57 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 91399607fe is in history

Change-Id: I66c941397f1550d020ae12090319ac8d19e01745
2020-03-20 03:43:37 +00:00
TreeHugger Robot
291dce128c [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: I243cada343b07b06cb99833f9d1a64ed5be5f1d9
2020-03-20 03:43:01 +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
f28bf18e57 [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: Ifc09356da641d2d801bbccf8370801821a0b6d12
2020-03-20 03:31:06 +00: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
3c137d807d Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev 2020-03-20 02:51:54 +00:00
TreeHugger Robot
aecc635805 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9
Change-Id: I85acdd02d89be77fb84a4e2df332e19e5c5a98e1
2020-03-20 02:38:50 +00:00
TreeHugger Robot
bb219af59b Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 8fd066d5d3
Change-Id: I9c779c447925b813728b399cb7b51ce5bc196685
2020-03-20 02:32:42 +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
8fd066d5d3 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
Change-Id: Ice2f1aae12ae46f1448bf11b25c78008c5ab4e34
2020-03-20 02:16:04 +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
7d5541262c Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 33650f397b
Change-Id: I492cddd4989b279b94ef051b7624e9a23603b7e6
2020-03-20 01:17:02 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00