Menghan Li
699eb07df2
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324
...
Change-Id: Ia2401d530ea63ef972f2365dba5d31e18df49f59
2020-03-18 01:24:20 +00:00
Menghan Li
29d33f3922
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef
...
Change-Id: Ia350ab892c9356a4f4aa02be26a1c28d625238cd
2020-03-18 01:18:26 +00:00
Menghan Li
286d6ac7dc
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef
...
Change-Id: I3773bbc143c16b62b8e6c052844b043db8a8ee0e
2020-03-18 01:18:06 +00:00
Menghan Li
f8eb71c324
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4
...
Change-Id: Id7d2b3ffd27ec01ff3bc2eb8a96dcfecb857b0a3
2020-03-18 01:05:52 +00:00
Menghan Li
1b14eb0eef
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4
...
Change-Id: I43d9c46d008f794cb4763356de0c8e15b11df236
2020-03-18 01:05:24 +00:00
Menghan Li
a56e57eaa4
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev
2020-03-18 00:50:43 +00:00
Eric Sandness
665b3d085e
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 am: 31f1136d1d am: ba4e378cd5
...
Change-Id: I21ca3e5fb9ee3cee12d30f6e9c4ba85bf507cea4
2020-03-17 21:17:57 +00:00
Eric Sandness
ba4e378cd5
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17 am: 31f1136d1d
...
Change-Id: If0a1ad7c0a57e083017b72ccd446486d4f115889
2020-03-17 21:12:33 +00:00
Eric Sandness
d4fe9e1e84
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: 2f0b328750 am: 248117ed17
...
Change-Id: I6336124b851ebeef27c01c3e9d2ac66b5b309f09
2020-03-17 21:12:24 +00:00
Eric Sandness
f483084edb
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1 am: f9720237fc
...
Change-Id: Ie0dedea428394e0b9b52584b48ea61671d8e1ef8
2020-03-17 21:12:16 +00:00
Eric Sandness
248117ed17
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: 2f0b328750
...
Change-Id: Ibc4e63891aea6c75ecc8039b67b4739f987f6d3f
2020-03-17 21:03:10 +00:00
Eric Sandness
f9720237fc
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1
...
Change-Id: If1b396d0d51b0e6cf27dec1fd67aee92e81151f9
2020-03-17 21:02:58 +00:00
Eric Sandness
31f1136d1d
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17
...
Change-Id: I496a3bd8d3537355b746cdd275de7924c63bf064
2020-03-17 21:02:48 +00:00
Eric Sandness
2f0b328750
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea
...
Change-Id: I96d55ab5a3bfb3adf1fb76fae54d08e7f1bf11e6
2020-03-17 20:46:30 +00:00
Eric Sandness
ea2c433f17
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea
...
Change-Id: Ibe1ecf76d11cfcb70935c88fb5c0df69eeab567a
2020-03-17 20:46:06 +00:00
Eric Sandness
e6951038a1
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f
...
Change-Id: Ibec79237493fc8ac537a57588db0751fcd92f91c
2020-03-17 20:46:05 +00:00
atrost
06da8b6ebc
Show only listUIChanges instead of all
...
Use the new method that filters out changes that shouldn't be in the
developer UI.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I7c725a1eca32e2d253b9671c789777b5422ed469
2020-03-17 20:37:49 +00:00
Eric Sandness
29a37648ea
Use ChooseLockGeneric When Started By Admin App am: 7430932305
...
Change-Id: I1a2cacc0c556b9ebdedf579ffe8516b7851f02dd
2020-03-17 20:34:49 +00:00
Eric Sandness
66df88126f
Use ChooseLockGeneric When Started By Admin App am: 7430932305
...
Change-Id: I78fd46587c0d3c598867c972bb9c9df038b30a1b
2020-03-17 20:34:12 +00:00
Eric Sandness
7430932305
Use ChooseLockGeneric When Started By Admin App
...
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity. If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric. Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.
Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
2020-03-17 17:16:08 +00:00
Automerger Merge Worker
47fd4be07b
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours am: b7d23d13b8 -s ours am: c8ada7e6ce -s ours
...
am skip reason: subject contains skip directive
Change-Id: I73785303e86016105cbbdc65f9d1f712e0f96b47
2020-03-17 16:45:28 +00:00
Automerger Merge Worker
775af87b61
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b am: 0eb0fce1be am: fb47646e1f
...
Change-Id: I17f0e5770a9eeb26e4b95046c17c64cc49e8ccb9
2020-03-17 16:41:45 +00:00
Automerger Merge Worker
92d7c44cf2
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: b98a90bfa2 -s ours am: 8064cadb1a -s ours am: 47a206c730 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I27a76f431c0d1a5ceba73bc5041687c9af169d2d
2020-03-17 16:39:53 +00:00
Automerger Merge Worker
22bb2f7239
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: a62897caa5 -s ours am: 96fd8defda -s ours
...
am skip reason: subject contains skip directive
Change-Id: I25cc29e234cdbc638d99b0ebd923fefb1064dbda
2020-03-17 16:37:46 +00:00
Automerger Merge Worker
f7e94bf9c2
Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp am: 47a86f9fe4 am: 5cadbf8bdf
...
Change-Id: I048064ab907854e7d1628e651983ca589f6c7509
2020-03-17 16:35:06 +00:00
Automerger Merge Worker
1fc0e49ca0
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: 71a49d8c8b am: c41ada31ec
...
Change-Id: I6b5c079028efebfa1a82863209d41f4fcf4bde85
2020-03-17 16:33:10 +00:00
Automerger Merge Worker
c8ada7e6ce
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours am: b7d23d13b8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2b0f6ab540998a2e3392d7ad5c7f5e025c03e82c
2020-03-17 16:10:32 +00:00
Automerger Merge Worker
fb47646e1f
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b am: 0eb0fce1be
...
Change-Id: I8be4153c518f3dcbb2437a365162f00075a24109
2020-03-17 16:10:22 +00:00
Automerger Merge Worker
47a206c730
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: b98a90bfa2 -s ours am: 8064cadb1a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3bcea10b5ff297b09d93280ab802866a2756be60
2020-03-17 15:57:10 +00:00
Automerger Merge Worker
96fd8defda
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: a62897caa5 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I41cbef92e34842dce60c66296b12bd1e12ed1fc2
2020-03-17 15:56:38 +00:00
Automerger Merge Worker
5cadbf8bdf
Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp am: 47a86f9fe4
...
Change-Id: I7ef3699a50468e6ef89c2563067151d2cba20ce2
2020-03-17 15:55:49 +00:00
Automerger Merge Worker
c41ada31ec
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: 71a49d8c8b
...
Change-Id: I4b3d3346c7add55cd30444adb28a41e520603980
2020-03-17 15:55:22 +00:00
Automerger Merge Worker
b7d23d13b8
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iebba4194d915bfd2b104a16a8eae123999663a21
2020-03-17 15:55:21 +00:00
Automerger Merge Worker
0eb0fce1be
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793 am: e4ff0ee00b
...
Change-Id: I5fa9faddac76db810c6c4350ded943dc802405d2
2020-03-17 15:55:01 +00:00
Automerger Merge Worker
8064cadb1a
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: b98a90bfa2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic8470477a77d37ea21517396ee1acfa2434a7e1b
2020-03-17 15:43:38 +00:00
Automerger Merge Worker
0245d4c0f6
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I55acec4120aa0844e55e4591c6073a1902b00bbe
2020-03-17 15:43:36 +00:00
Automerger Merge Worker
a62897caa5
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I85c005713515e9397827f38651326f5f63d47f80
2020-03-17 15:43:25 +00:00
Automerger Merge Worker
47a86f9fe4
Merge "Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932" into rvc-d1-dev-plus-aosp
2020-03-17 15:42:59 +00:00
Automerger Merge Worker
71a49d8c8b
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: 2779662793
...
Change-Id: I66efa1d7430a50a3a8f5bf6f04ade55377d2bfaf
2020-03-17 15:42:53 +00:00
Automerger Merge Worker
75ae98d1be
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51 am: b67ed25932
...
Change-Id: Ia679b9dca2a3f98eca1647e276db82ff426c0791
2020-03-17 15:42:53 +00:00
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
b98a90bfa2
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8ce297d4d28cbf33b51c59c9ed71c12044c211e3
2020-03-17 15:27:12 +00:00
Automerger Merge Worker
d9dcf5bed2
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I322de6c13adf1a7d3ca194d6b4b9a8d3f6a270d6
2020-03-17 15:27:08 +00:00
Automerger Merge Worker
b67ed25932
Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
...
Change-Id: I7c2992488d3ab3d552a12e207093d1deffee4ded
2020-03-17 15:26:33 +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
Automerger Merge Worker
f9b7313545
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id75d1c9d9ba97160bfa72e8bcdde3a0407856157
2020-03-17 15:11:40 +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
49c147c23b
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: e735954a98 am: 5ebbcfcffc am: c07d8efd60
...
Change-Id: I9b00c874b6c90fc889144ea3868b516be037017a
2020-03-17 14:36:42 +00:00
Automerger Merge Worker
c07d8efd60
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: e735954a98 am: 5ebbcfcffc
...
Change-Id: I2031b25b6767f547110a59adfaacbb4ff6bbd20c
2020-03-17 14:26:51 +00:00
Automerger Merge Worker
db1d4b1710
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: 618ebc3fdf am: 1f15f102f4 am: 943eafc205
...
Change-Id: Ib8acef5fd8f9ce7f70a266b7a8736d28f732cc60
2020-03-17 14:14:36 +00:00
