Automerger Merge Worker
f82c724f30
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640 am: 05985cb26e
...
Change-Id: Ia01fd111005b4806d82f909d05cbd3f6359e61d4
2020-03-17 12:04:25 +00:00
Automerger Merge Worker
c57774521c
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
...
Change-Id: I6b25ea976cbde89633e917491513254163d8418d
2020-03-17 11:50:00 +00:00
Automerger Merge Worker
05985cb26e
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
...
Change-Id: I055e1aa8b1be85d6ba1218642447885fa9b454d9
2020-03-17 11:49:55 +00:00
TreeHugger Robot
217740d640
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev
2020-03-17 11:32:34 +00:00
Bill Yi
8f23d00553
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I88eb61ab20394d1cf91380f2823a536faaa8619c
2020-03-17 04:18:33 -07:00
calvinpan
ff11f200c8
Add NR Global to the logic to check if it is Global
...
Bug: 151285260
Test: Build pass
Change-Id: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
2020-03-17 18:27:34 +08:00
Alex Johnston
79e66ffafe
Fix strings for certificate installation in Settings
...
Certificates privacy page
* Changed 'Your privacy is at risk' to
'Your data won't be private'.
* Change 'information' to 'data'.
* Changed 'Install anyways' to
'Install anyways'.
Can't install certificate dialog
* Changed 'Can't install certificates'
to 'Can't use this file'.
Bug: 151303108
Test: Manual testing
Change-Id: Ia66ff7210ae77204fa2e59f3264f5c799cc47436
2020-03-17 10:05:28 +00:00
govenliu
26b70a9bc7
[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest
...
Remove the @Ignore tag in ConfigureWifiEntryFragmentTest, and add a fake NetworkDetailsTracker to pass test.
Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiEntryFragmentTest
Change-Id: Icf06d27030fa2c68d3c2bee03beb583592beb599
2020-03-17 18:05:00 +08:00
Yanting Yang
298a7fe2e5
Remove the index of the homepage category tiles
...
Do not index the tiles of homepage category since we would like to index
their target activity for search.
Fixes: 151418948
Test: visual
Change-Id: I693534de006b4dbcaf192858e6f7d031bad78fef
2020-03-17 17:55:49 +08:00
SongFerngWang
3d54554521
Fix sim pin lock preference disappear in dual sim.
...
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.
Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-17 14:35:31 +08:00
Automerger Merge Worker
708fa8dc80
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: e599f0432e
...
Change-Id: I204f5e8e8738f3e1ed1202556d455ed7aa2cfa6f
2020-03-17 06:11:59 +00:00
Automerger Merge Worker
d4bf77db85
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041 am: da9185b887
...
Change-Id: I0a8007c3bfd9dbd61f1856d139a54e97b429fb99
2020-03-17 06:11:19 +00:00
Automerger Merge Worker
da9185b887
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
...
Change-Id: I6807e9d6a88c7a82b5835c773f1216bbe5cd3f24
2020-03-17 05:58:49 +00:00
Automerger Merge Worker
e599f0432e
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
...
Change-Id: Ief773b87a528393024fde3bef29816f6860e07f2
2020-03-17 05:58:42 +00:00
TreeHugger Robot
1a84719041
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev
2020-03-17 05:43:45 +00:00
Automerger Merge Worker
50130a741b
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: bd59e9ad27
...
Change-Id: Iaf734e197a78bc6d513c0cd414d7b174f6d68a7d
2020-03-17 03:55:48 +00:00
Automerger Merge Worker
dab418626e
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414 am: e1c3cdf682
...
Change-Id: I0819ebac710020ea2df799ada34f9fef48337860
2020-03-17 03:55:31 +00:00
Automerger Merge Worker
e1c3cdf682
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
...
Change-Id: I7e826cef3b212bcc53cbdc863e6e241fe656429a
2020-03-17 03:45:49 +00:00
Automerger Merge Worker
bd59e9ad27
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
...
Change-Id: Iada645d9939d5b7343d1ebef27ccba669e9dc268
2020-03-17 03:45:43 +00:00
tim peng
95cd4c9414
Merge "Output switcher header is not updated with the latest media content" into rvc-dev
2020-03-17 03:26:50 +00:00
Automerger Merge Worker
05f048dde5
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 371df82782
...
Change-Id: I68b21a5b1352674b31ec9b512684856c45142929
2020-03-17 03:06:23 +00:00
Automerger Merge Worker
e37d169988
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b am: 0b661e606d
...
Change-Id: I124abd0ffb65c56245669d26f3d9400bed89dc4a
2020-03-17 03:05:36 +00:00
Automerger Merge Worker
371df82782
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
...
Change-Id: I226fb53261abdeb91e6b8bc77eadc698b1863140
2020-03-17 02:48:03 +00:00
Automerger Merge Worker
0b661e606d
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
...
Change-Id: Ia0d08c479a2e61f9a35e09c7f3b1bb1f11cac077
2020-03-17 02:47:57 +00:00
Menghan Li
3f5b95193b
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev
2020-03-17 02:28:23 +00:00
Tim Peng
36c4949414
Output switcher header is not updated with the latest media content
...
-Register media controller callback
-Update panel header when medadata changes
-Add test cases
Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Id0b8f997899a96c0c94ca6bf099e624a9e87795b
2020-03-17 09:02:34 +08:00
Automerger Merge Worker
c7908ef1b0
Require attention pref not searchable by default am: 593b5671c8 am: 391d6763fa
...
Change-Id: Idcafe099822792c6ae88ffc14a6f6db647c2ea06
2020-03-17 00:50:50 +00:00
Automerger Merge Worker
d227833dde
Require attention pref not searchable by default am: 593b5671c8 am: 441019142c
...
Change-Id: I7e5d52e4317a06495ad3c62db4dc7682401d9e03
2020-03-17 00:50:24 +00:00
Automerger Merge Worker
391d6763fa
Require attention pref not searchable by default am: 593b5671c8
...
Change-Id: I42a89f083a44b644b95f88ebf0a4ef93036a5ccd
2020-03-17 00:34:28 +00:00
Automerger Merge Worker
441019142c
Require attention pref not searchable by default am: 593b5671c8
...
Change-Id: I2f3103877ddca02910682d30deac7cd8bf62f664
2020-03-17 00:34:21 +00:00
Blake Kragten
8881b110cd
Enhanced Connectivity Enabled Default
...
Changed to enable enhanced connectivity by default
Test: On Device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=EnhancedConnectivityPreferenceControllerTest
Test: On-device using developer option menu
Bug: 151633345
Change-Id: I8706f3a15af02214f4516503e685ff2b8f348a3a
2020-03-16 16:46:03 -07:00
Automerger Merge Worker
781ac2d738
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878 am: a7a2a28247
...
Change-Id: I8a49a6600aed234c5dc8659ee1e43d5ca9557e38
2020-03-16 22:56:11 +00:00
Automerger Merge Worker
875e3d7e9f
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878
...
Change-Id: I0a54df099ff98d68a165ce41b5de18ab27bcc8bf
2020-03-16 22:40:58 +00:00
Automerger Merge Worker
a7a2a28247
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878
...
Change-Id: I4f885bb7ccd171693ed239441dd86a5f41ccf503
2020-03-16 22:40:58 +00:00
Automerger Merge Worker
0fbe648878
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017
...
Change-Id: I1a5185fb2c7eae81cd98ccbe713a333e09431d64
2020-03-16 22:21:51 +00:00
Treehugger Robot
177ce8f017
Merge "Fix mismatching intent filter string in AndroidManifest.xml"
2020-03-16 22:07:18 +00:00
joshmccloskey
593b5671c8
Require attention pref not searchable by default
...
Test: Attempted to search with the keyword eyes and found nothing.
Bug: 150933895
Change-Id: Ic69d4fc9fe495fe6d133b695ce48055f6fd65d35
2020-03-16 22:03:28 +00:00
Grace Jia
16092ab56f
Fix mismatching intent filter string in AndroidManifest.xml
...
Test: Manual
Bug: 149524255
Change-Id: Ic5bfbfa41cba18ccc8166624da33c70b69db73f5
2020-03-16 13:27:25 -07:00
Kweku Adams
a7e58d7732
Change to public POWER_SAVE_MODE_CHANGED broadcast.
...
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.
Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
2020-03-16 12:56:46 -07:00
Automerger Merge Worker
5d89b0f2ec
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: 022790b197
...
Change-Id: I5884d3ffde43083d9860626f94b84b7b224080a8
2020-03-16 19:26:38 +00:00
Automerger Merge Worker
19b27604b6
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7
...
Change-Id: Id7f186a312c69aeed5c7acefd7c3865df361e76a
2020-03-16 19:25:31 +00:00
Automerger Merge Worker
f4ca410ad7
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
...
Change-Id: I4eea86045bc033677c33c716c39174314ffe1d7e
2020-03-16 19:09:20 +00:00
Automerger Merge Worker
022790b197
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
...
Change-Id: Ic74ab9f03b43fd1eebcb6fc32556f37b31c20943
2020-03-16 19:08:28 +00:00
TreeHugger Robot
b2c35f7fcc
Merge "Do not finish early if caller is SUW" into rvc-dev
2020-03-16 18:56:54 +00:00
Automerger Merge Worker
ea3d48855c
Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp
2020-03-16 18:42:57 +00:00
Automerger Merge Worker
015ea725f6
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603
...
Change-Id: I8fcd965aed01fddb516eb6bb1b99486331dff0c9
2020-03-16 18:42:53 +00:00
Automerger Merge Worker
8965b8677b
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010
...
Change-Id: I639eaa2d87eb80b5b4b12779dc2750445c9f9a84
2020-03-16 18:42:49 +00:00
Automerger Merge Worker
6d4df5ece8
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp
2020-03-16 18:42:22 +00:00
Automerger Merge Worker
e4258d5c03
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I140b938dff8b500f6807a36ce8ffe81a28cbc473
2020-03-16 18:42:18 +00:00
Automerger Merge Worker
624190cb2a
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie14b440004aa649b06f10834e80316cee2a99348
2020-03-16 18:42:14 +00:00