Commit Graph

61125 Commits

Author SHA1 Message Date
Tsung-Mao Fang
86ddac58a9 Ignore broken tests
Bug: 151913744
Bug: 151572330
Test: robo test
Change-Id: I59abca488d8cff2eb043ebe66aff9563cf3a01d4
Merged-In: I59abca488d8cff2eb043ebe66aff9563cf3a01d4
(cherry picked from commit ae8fbea47a)
2020-03-20 12:49:53 +00:00
Tsung-Mao Fang
036f83983d Ignore broken test cases
Test: Run robo test
Bug: 151572330
Change-Id: I2e2f0664d6e26827513632772e6b77c9f8b089a7
Merged-In: I2e2f0664d6e26827513632772e6b77c9f8b089a7
(cherry picked from commit d4ba7c1fa7)
2020-03-20 12:49:13 +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
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
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
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
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
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
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
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
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