Automerger Merge Worker
e4ff0ee00b
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
am: 2779662793
...
Change-Id: If5483f1abf573bfef6b5c33931b4514952eff52f
2020-03-17 15:42:40 +00:00
Automerger Merge Worker
2779662793
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
...
Change-Id: I5c40a566a91465c230c98be2201d158c945c7103
2020-03-17 15:26:05 +00:00
Alex Johnston
e61aaaab51
Merge "Fix strings for certificate installation in Settings" into rvc-dev
2020-03-17 15:07:18 +00:00
Automerger Merge Worker
e735954a98
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
am: a4ad8f636a
...
Change-Id: Ib20cbc26491d8b64b8971da3751da666e3878bbd
2020-03-17 13:48:15 +00:00
Automerger Merge Worker
a4ad8f636a
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
...
Change-Id: If102804bbb1335393bcd208f32cf66ab9a58e41d
2020-03-17 13:28:11 +00:00
Automerger Merge Worker
3be6478734
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
am: 85b0f5fcd2
...
Change-Id: I0d4b0f84938382a99d8898902ed290bbb2884b75
2020-03-17 13:15:17 +00:00
Yanting Yang
9204d76c45
Merge "Remove the index of the homepage category tiles" into rvc-dev
2020-03-17 13:11:40 +00:00
Automerger Merge Worker
85b0f5fcd2
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
...
Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
2020-03-17 13:03:00 +00:00
TreeHugger Robot
76f4a29510
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev
2020-03-17 12:51:04 +00:00
Automerger Merge Worker
4059a7debf
Merge "Fix sim pin lock preference disappear in dual sim." into rvc-dev am: 217740d640
am: 05985cb26e
...
Change-Id: I0e6ea23f432c71562274c69e1c203e15cef9ce45
2020-03-17 12:04:32 +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
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
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
b8b7c24bcc
Merge "Change to public POWER_SAVE_MODE_CHANGED broadcast." into rvc-dev am: 1a84719041
am: da9185b887
...
Change-Id: I34e02d8f1edbe3db7e9128feda8fafa27bcd6695
2020-03-17 06:11:44 +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
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
20de5d75b3
Merge "Output switcher header is not updated with the latest media content" into rvc-dev am: 95cd4c9414
am: e1c3cdf682
...
Change-Id: I76fa0d2087a9f540d2f9fcfe3c4f2b3e2ec7f45f
2020-03-17 03:55:47 +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
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
baa53722d9
Merge "Update R accessibility assets and strings (4/n)" into rvc-dev am: 3f5b95193b
am: 0b661e606d
...
Change-Id: Ie8bed1d1db32aed9402594b81675477b6c214be5
2020-03-17 03:05:16 +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
01b0368b93
Require attention pref not searchable by default am: 593b5671c8
am: 441019142c
...
Change-Id: I06703e4bf5914bf317e8db8c9cea5260a861e58a
2020-03-17 00:50:20 +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
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
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
28153ffaa7
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
am: f4ca410ad7
...
Change-Id: Iddb2ce5e1d29636d2583e113412c917cc286dcf1
2020-03-16 19:26:36 +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
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
894c3dc565
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
am: d3b8d8c603
...
Change-Id: I0734d11a825d521825f474c17137058eb33f128c
2020-03-16 18:43:03 +00:00
Automerger Merge Worker
4629097190
[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: Ic1e70e00fe7273b71d5e2e45c407d1f0a750ef7a
2020-03-16 18:42:56 +00:00
Automerger Merge Worker
d3b8d8c603
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
...
Change-Id: I9b3494582be6e8e3563dc75e59ed8d921b834475
2020-03-16 18:26:26 +00:00
Automerger Merge Worker
4768304de8
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499
-s ours am: 0a9e463fff
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If219277f2764d85a82482fd2c8782bf6caa1a3c7
2020-03-16 18:24:32 +00:00
TreeHugger Robot
6c9cad2caf
Merge "Update NLS/NAS warning text" into rvc-dev
2020-03-16 18:10:09 +00:00
Automerger Merge Worker
0a9e463fff
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I6e10c86bf149e6eae1e1efbc00da7ec2e0e86c88
2020-03-16 18:09:37 +00:00
Kevin Chyn
e6bcc49eb9
Do not finish early if caller is SUW
...
Fixes: 151576034
Test: Wipe device, go past fingerprint enrollment in SUW, press
back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
2020-03-16 09:32:41 -07:00
Bill Yi
d49c677499
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
2020-03-16 08:20:15 -07:00
Automerger Merge Worker
875cb73df7
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
am: cdbca2b45e
...
Change-Id: I75c4fd88132b994e36adbb776f7b8a57a7f34cb3
2020-03-16 13:57:03 +00:00
Automerger Merge Worker
5a67d16648
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c
am: 2fe4235ae3
...
Change-Id: I87a5cbc54cb9603157b1abf1b8a8d48551db25e5
2020-03-16 13:55:53 +00:00
Automerger Merge Worker
cdbca2b45e
Merge "Update strings for Screen Attention suggestion." into rvc-dev am: b94605c378
...
Change-Id: I3641366b12a396edc6dbafc50700f248bac002a8
2020-03-16 13:47:57 +00:00
TreeHugger Robot
b94605c378
Merge "Update strings for Screen Attention suggestion." into rvc-dev
2020-03-16 13:46:14 +00:00
Automerger Merge Worker
2fe4235ae3
Merge "Handle ransferring state in output switcher" into rvc-dev am: b669fff40c
...
Change-Id: I03eb5de2959fd59643ebb39d155f91fd2fb02298
2020-03-16 13:39:08 +00:00
Julia Reynolds
68fad762ff
Update NLS/NAS warning text
...
Test: manual
Fixes: 145129456
Change-Id: Ie3e7ecb432445c596d888614ae71cff27873ac6b
2020-03-16 09:30:10 -04:00
tim peng
b669fff40c
Merge "Handle ransferring state in output switcher" into rvc-dev
2020-03-16 13:17:03 +00:00
Automerger Merge Worker
6bc38f14a5
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
am: 2ae7c371cb
...
Change-Id: I80306346be78398203ec7155ce2e148a6d46b0b2
2020-03-16 12:33:58 +00:00
Automerger Merge Worker
2ae7c371cb
Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
...
Change-Id: I0bdc9b69c620576e2575e628af5d60d02f2eb58a
2020-03-16 12:21:21 +00:00