Commit Graph

60250 Commits

Author SHA1 Message Date
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
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
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
2ae7c371cb Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev am: 6d6e0f45b2
Change-Id: I0bdc9b69c620576e2575e628af5d60d02f2eb58a
2020-03-16 12:21:21 +00:00
TreeHugger Robot
6d6e0f45b2 Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev 2020-03-16 12:05:02 +00:00
Yi-Ling Chuang
f288a4ec53 Update strings for Screen Attention suggestion.
Bug: 144865404
Test: rebuild
Change-Id: Id5ab9a68a5f83c6fdc6451b96d8e7bfd831891d1
2020-03-16 17:54:39 +08:00
Automerger Merge Worker
4c2d10ee97 [Settings] Fix MobileNetworkActivity test case am: 2fad549b08
Change-Id: I561fafa46f5970c033fca48d9d0d6071333c797b
2020-03-16 09:46:43 +00:00
Alex Johnston
8d430de5d5 Fix AppButtonPreferenceControllerTest
* isSystem was not being mocked.
* The tests where isSystem should return true
  were not being tested properly.

Bug: 151569506
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ib4249bca8f3c0321d0b64b4dbd4c4e5fc29586e1
2020-03-16 09:37:10 +00:00
zoey chen
2fad549b08 [Settings] Fix MobileNetworkActivity test case
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkActivityTest
Bug: 144664534
Change-Id: Ifc63646f709b29c3a8947430bcec6a82fae02ea5
2020-03-16 14:51:16 +08:00
Automerger Merge Worker
4dfb70f145 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev am: 3a18ee5c79
Change-Id: Id9d1849ccdb5842b706fe7bd3bc28563a14caeca
2020-03-16 05:11:42 +00:00
tim peng
3a18ee5c79 Merge "Remove unnecessary permission for output switcher panel" into rvc-dev 2020-03-16 04:56:01 +00:00
Automerger Merge Worker
7f0be7ea69 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev am: 42a906d874
Change-Id: I033b74fba64e39993173c995e95696ed725db642
2020-03-16 04:06:29 +00:00
Mehdi Alizadeh
42a906d874 Merge "Use Gesture nav settings activity instead of dialog" into rvc-dev 2020-03-16 04:01:11 +00:00
Automerger Merge Worker
90d0060f81 Merge "Remove duplicated index search data" into rvc-dev am: ed39b5bb1a
Change-Id: I394df077b58555d88ffeeb52fe727a772f9f6574
2020-03-16 01:52:03 +00:00
Edgar Wang
ed39b5bb1a Merge "Remove duplicated index search data" into rvc-dev 2020-03-16 01:42:22 +00:00
Automerger Merge Worker
148b737ef2 Merge "Blur developer setting" into rvc-dev am: 59b3974433
Change-Id: Iddb1e91eb3aacbc71dde029cbb08873992b92f90
2020-03-15 23:40:09 +00:00
Lucas Dupin
59b3974433 Merge "Blur developer setting" into rvc-dev 2020-03-15 23:28:13 +00:00
Hall Liu
45e4b8948c Rename NotificationChannel#setBlockableSystem
Rename the method to setBlockable. Also rename isBlockableSystem in the
same way.

Bug: 151311073
Test: atest NotificationChannelTest
Change-Id: I0504f8043dc864fe6677f2e65783068ffa3437ba
2020-03-13 13:54:10 -07:00
Automerger Merge Worker
9f2fb9b595 Merge "Refine remove locale warning dialog string" into rvc-dev am: 907905bb96
Change-Id: Ifd13a1a6501378de9a41440a4a6cfb956fc75c71
2020-03-13 16:52:12 +00:00
TreeHugger Robot
907905bb96 Merge "Refine remove locale warning dialog string" into rvc-dev 2020-03-13 16:43:45 +00:00
Automerger Merge Worker
25b03c9930 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev am: 117995aec4
Change-Id: I05cbeae87709b99b0fb5a2b7864bbef6071353d9
2020-03-13 16:34:26 +00:00
Brad Ebinger
117995aec4 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." into rvc-dev 2020-03-13 16:23:10 +00:00
Automerger Merge Worker
62d9891328 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059
Change-Id: I317bd4c4e23b3738f95b90950e64c1a0181925b9
2020-03-13 14:45:11 +00:00
Alex Johnston
37fa5bd059 Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev 2020-03-13 14:28:15 +00:00
menghanli
9785c7e290 Update R accessibility assets and strings (4/n)
- Color inversion preview
- Caption manager preview
- Dwell preview

Bug: 148837311
Test: Manual test
Change-Id: Ia637074c4282bbc51befc44efb0a4ff474f86b26
2020-03-13 12:43:36 +00:00
Automerger Merge Worker
f08d965b53 Merge "Fix tests" into rvc-dev am: 6d8e0fed61
Change-Id: I76a1639f3530aee4c47fcc3cac1e01bfbe02aea5
2020-03-13 09:38:45 +00:00
TreeHugger Robot
6d8e0fed61 Merge "Fix tests" into rvc-dev 2020-03-13 09:27:16 +00:00
Automerger Merge Worker
e94cbd98ff Merge "Remove ignore test case" into rvc-dev am: ad30345078
Change-Id: I6f1e2d5f3429c6fccee5d80403e27b445cd40012
2020-03-13 05:01:38 +00:00
Edgar Wang
3b47408016 Refine remove locale warning dialog string
- If the first language is not selected, just remove the body copy
  else warning user the locale will change to another language.

Fixes: 140723349
Test: manual & robotest
Change-Id: I9fec17ae85889f2864c3f3cae744f7181e6f9b2c
2020-03-13 12:49:21 +08:00
Edgar Wang
ad30345078 Merge "Remove ignore test case" into rvc-dev 2020-03-13 04:45:59 +00:00
Automerger Merge Worker
3f6c723044 Merge "Use values-night to control the dark mode background color" into rvc-dev am: 89a6fafa33
Change-Id: Iee7a93a3c65d7bdb432937bcc5b81d2f3dd7fa45
2020-03-13 03:27:02 +00:00
TreeHugger Robot
89a6fafa33 Merge "Use values-night to control the dark mode background color" into rvc-dev 2020-03-13 03:13:27 +00:00
Brad Ebinger
95aeac6790 Set the CHAR_LIMIT to 110 in order to support more translations.
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 150941009
Test: manual
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
2020-03-12 18:15:54 -07:00
Automerger Merge Worker
ed92f8425d Merge "Remove nested scrolling" into rvc-dev am: 4a1f517585
Change-Id: I391dd964c025de214e6f59bee1a26a6e426de0ac
2020-03-12 21:53:58 +00:00
TreeHugger Robot
4a1f517585 Merge "Remove nested scrolling" into rvc-dev 2020-03-12 21:44:27 +00:00
Julia Reynolds
49f40ee77b Fix tests
Fixing one of them by removing an unneeded setting

Test: RunSettingsRoboTests2
Fixes: 151279674
Change-Id: If2b513ba7b4bf8ec5183e2a9457caab3d3e06dc4
2020-03-12 17:27:35 -04:00
Automerger Merge Worker
ec6828f05e Merge "Log some actions for changing wifi hotspot config" into rvc-dev am: 0ad0a50538
Change-Id: I63b280ad795bb32210b0c45bc5f7bfb424f85919
2020-03-12 20:02:42 +00:00
Zhen Zhang
0ad0a50538 Merge "Log some actions for changing wifi hotspot config" into rvc-dev 2020-03-12 19:47:42 +00:00
Julia Reynolds
a7a44fe058 Remove nested scrolling
Test: manual
Fixes: 151334452
Change-Id: I4d2f5eb268cda1e1a19187e2812fa026f44484f9
2020-03-12 15:20:39 -04:00
Automerger Merge Worker
9469b91a22 Mark CHANGE_RESTRICT_SAW_INTENT as logging only am: a84c219c30
Change-Id: Iedfb2e19dfd12a5f6be25be28556d0d1fbc95def
2020-03-12 17:53:36 +00:00
Alex Johnston
341f995971 DPC can be uninstalled in personal profile in New COPE
* For an organization-owned device, the DPC should be able to
  be uninstalled in the personal profile. Previously, the
  observed behaviour was that the uninstall button in the App
  Info Screen was being greyed out.
* This was because the previous logic did not allow for
  uninstalling any app which has a profile owner or device
  owner on *any* user.
* This CL updates this logic, such that, for non-system apps
  uninstalling is blocked only if the app has a profile owner
  or device owner for the current calling user.

Bug: 149381804
Test: Manual testing
      atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Change-Id: Ifaf03daa41724dbbd869c7e1371a77cc39d15ac7
2020-03-12 13:38:19 +00:00