Anna Trostanetski
ad75e96c91
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298 am: 038b9549a8
...
Change-Id: I504bfe242a278b7acbee72f6d17fefcdf9deab5c
2020-03-18 18:47:14 +00:00
Anna Trostanetski
038b9549a8
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298
...
Change-Id: I8d94992534da7e2b971908c1e43d5cbc29f2d4d7
2020-03-18 18:20:23 +00:00
Anna Trostanetski
9d653e5298
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd
...
Change-Id: I7f238ccc501bf9a359c129ab019e627eb1be16d3
2020-03-18 18:18:29 +00:00
Anna Trostanetski
49187777dd
Merge "Show only listUIChanges instead of all" into rvc-dev
2020-03-18 18:15:52 +00:00
PETER LIANG
3a04848876
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: 1bb9e8ea7a am: f0c85d278c
...
Change-Id: I35568e427baf854046e0ba3942b41aa8bb8315d2
2020-03-18 13:07:46 +00:00
PETER LIANG
57e9022ba5
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: e0ec4b853b am: f49bf6be94
...
Change-Id: I57162b24e8803d29f78640886f382d8b13b85e8a
2020-03-18 12:55:38 +00:00
PETER LIANG
829edadfaf
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: bdf8412ec1
...
Change-Id: I9595f81a103d3a61f0555aed262adaf6b1bad933
2020-03-18 12:55:11 +00:00
PETER LIANG
f0c85d278c
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: 1bb9e8ea7a
...
Change-Id: Ifc1d74c3111829cf81d77c6ea155540ea7d1c075
2020-03-18 12:54:44 +00:00
PETER LIANG
f49bf6be94
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: e0ec4b853b
...
Change-Id: Ie487ab9124d61fad77273277ec235a14330f6e8f
2020-03-18 12:36:02 +00:00
PETER LIANG
1bb9e8ea7a
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa
...
Change-Id: If267e5c69924bbc1ea8a047f9b5db8944a6a9251
2020-03-18 12:36:02 +00:00
PETER LIANG
bdf8412ec1
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa
...
Change-Id: I53d67dfee3c722161244bd2bd4348cb9ec585d34
2020-03-18 12:35:53 +00:00
PETER LIANG
e0ec4b853b
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb
...
Change-Id: I97f07e429505e23ca5e7ff34e1f48dd635c1d780
2020-03-18 12:08:16 +00:00
PETER LIANG
6acf430dfa
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb
...
Change-Id: I3289e93f31d29e4bfba953e775b2097ddf776e26
2020-03-18 12:08:08 +00:00
PETER LIANG
76fb737beb
Merge "Revise strings for tutorial improvement." into rvc-dev
2020-03-18 11:50:18 +00:00
Peter_Liang
8b411bfa55
Revise strings for tutorial improvement.
...
Bug: 148989018
Test: manual test
Change-Id: I249c5ae896123b546b028c959cd1a5404008aec3
2020-03-18 17:24:16 +08:00
TreeHugger Robot
32cac4cd56
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768 am: 7673cfa430
...
Change-Id: Id2fdac3d4ce632066cc65f914a5e24b5cd8ec38b
2020-03-18 06:11:05 +00:00
TreeHugger Robot
54ad6ea477
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3 am: a830006b74
...
Change-Id: I09e6aa72a3f7401ab60893b4940ad4ea8065cbf4
2020-03-18 06:01:11 +00:00
TreeHugger Robot
e6e0431e66
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d
...
Change-Id: If4407cb7becef2baa8a868fc09f9183bd4d6a49d
2020-03-18 06:01:03 +00:00
TreeHugger Robot
7673cfa430
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768
...
Change-Id: I06bb2b3b3698e91f35d7bc54d798c917185fbb42
2020-03-18 06:01:02 +00:00
TreeHugger Robot
8212c33768
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186
...
Change-Id: Ic8f5ed6ee3132904f00e74f53259aeb274c82fed
2020-03-18 05:49:02 +00:00
TreeHugger Robot
a830006b74
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: e281086ce3
...
Change-Id: Ib9500d7e76796c394500717a5b1bbebf4c8a9c21
2020-03-18 05:49:02 +00:00
TreeHugger Robot
5e7b076c2d
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186
...
Change-Id: I7071b8d5bc3d1c1ee20b75ac92f12d532e723f14
2020-03-18 05:48:47 +00:00
TreeHugger Robot
e281086ce3
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
...
Change-Id: I3ddb79684d912b7c336a6ffaf165a2a7ab1b5c06
2020-03-18 05:37:21 +00:00
TreeHugger Robot
17962d8186
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
...
Change-Id: I260656236087cc7a0bff2f278a90dc7f3d52b688
2020-03-18 05:37:14 +00:00
TreeHugger Robot
a2a1056dda
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev
2020-03-18 05:22:27 +00:00
Menghan Li
f65ba41a8b
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922 am: 6be3263f5c
...
Change-Id: I7c20a38db31d7b4ca891f3d6c1a53e57e19797c8
2020-03-18 01:46:20 +00:00
Menghan Li
41b3ea78ea
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: f8eb71c324 am: 699eb07df2
...
Change-Id: Iecf70d242ca907315132d3edf2af700f1f6e4ba7
2020-03-18 01:30:08 +00:00
Menghan Li
23627fad2b
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 286d6ac7dc
...
Change-Id: I48e195e58f45f53a28b691dbc5a556bcb8d21da7
2020-03-18 01:30:02 +00:00
Menghan Li
6be3263f5c
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922
...
Change-Id: I0717caf7787cc4ee1cfc5acac204e7753a4d2680
2020-03-18 01:29:57 +00:00
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
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
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
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
