Miranda Kephart
b707154e3c
[automerger skipped] Merging from qt-qpr1-sysui-dev @ build 5855545
...
am: 28812b0febe9963e37d5
2019-09-10 13:46:36 -07:00
Miranda Kephart
e7e1027743
Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545" into qt-qpr1-dev-plus-aosp
2019-09-10 17:20:56 +00:00
Android Build Merger (Role)
fce2b7b76b
Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 am: 006edb1f6d" into qt-qpr1-dev-plus-aosp
2019-09-10 06:26:30 +00:00
joshmccloskey
56e312b2a3
Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50
...
am: 349e664035
2019-09-09 23:26:12 -07:00
joshmccloskey
99278c0528
Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50
...
am: 006edb1f6d
2019-09-09 23:26:12 -07:00
joshmccloskey
006edb1f6d
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
...
am: ff01d52d50
2019-09-09 23:20:26 -07:00
joshmccloskey
349e664035
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
...
am: ff01d52d50
2019-09-09 23:20:15 -07:00
TreeHugger Robot
ff01d52d50
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
2019-09-10 06:02:39 +00:00
joshmccloskey
d98257bae6
Change cancel button type to skip for SUW
...
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes: 140702414
Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
2019-09-09 16:46:03 -07:00
Miranda Kephart
28812b0feb
Merging from qt-qpr1-sysui-dev @ build 5855545
...
Test: manual, presubmit on the source branch
Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
2019-09-09 21:32:22 +00:00
Miranda Kephart
e9963e37d5
Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545
...
Test: manual, presubmit on the source branch
Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19
2019-09-09 20:27:44 +00:00
Bill Yi
5a7ae4f046
[automerger skipped] Import translations. DO NOT MERGE am: 53e826122d -s ours
...
am: 8d9317075c
2019-09-07 18:39:45 -07:00
Bill Yi
728f836d4d
[automerger skipped] Import translations. DO NOT MERGE am: 53e826122d -s ours
...
am: 8d9317075c
2019-09-07 18:38:10 -07:00
Bill Yi
8d9317075c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 53e826122d
2019-09-07 18:27:34 -07:00
Bill Yi
76517fd1b2
[automerger skipped] Import translations. DO NOT MERGE am: 53e826122d -s ours
...
am: c47b5e1943
2019-09-06 17:58:14 -07:00
Bill Yi
c47b5e1943
[automerger skipped] Import translations. DO NOT MERGE
...
am: 53e826122d
2019-09-06 17:51:15 -07:00
Bill Yi
53e826122d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ie16be62ead2b453c69d0201a5aa5e7ae3411405f
2019-09-06 16:30:38 +00:00
Raff Tsai
6f8797f86c
Fix Settings crash when click uninstall button
...
am: 2d709131ba
2019-09-06 01:47:19 -07:00
Raff Tsai
6748951f07
Fix Settings crash when click uninstall button
...
am: 2d709131ba
2019-09-06 01:47:16 -07:00
Raff Tsai
2d709131ba
Fix Settings crash when click uninstall button
...
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.
Fixes: 138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
(cherry picked from commit 88228c3399
2019-09-06 05:24:12 +00:00
Android Build Merger (Role)
3b0a921326
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours am: f85844d8e6 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-09-06 01:36:21 +00:00
Bill Yi
b48f6f6eb1
[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours
...
am: f85844d8e6
2019-09-05 18:36:05 -07:00
Bill Yi
8675e85259
[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours
...
am: 059dddf30e
2019-09-05 18:36:04 -07:00
Bill Yi
10ff483197
[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours
...
am: f85844d8e6
2019-09-05 18:36:03 -07:00
Bill Yi
f85844d8e6
[automerger skipped] Import translations. DO NOT MERGE
...
am: e2f5f9b876
2019-09-05 18:30:04 -07:00
Bill Yi
059dddf30e
[automerger skipped] Import translations. DO NOT MERGE
...
am: e2f5f9b876
2019-09-05 18:30:03 -07:00
Bill Yi
e2f5f9b876
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 140445577
Change-Id: I162cbffdd4239b49c258bae8df318f7c4ebd0643
2019-09-05 17:10:26 -07:00
Android Build Merger (Role)
cd7f47f582
Merge "Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad am: cbeeed9942" into qt-qpr1-dev-plus-aosp
2019-09-05 23:10:11 +00:00
Joshua Mccloskey
1ceb35b88f
Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
...
am: cbeeed9942
2019-09-05 16:10:02 -07:00
Joshua Mccloskey
0ec126ead9
Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
...
am: 820c723e59
2019-09-05 16:10:01 -07:00
Joshua Mccloskey
b8e4bd45c2
Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
...
am: cbeeed9942
2019-09-05 16:10:00 -07:00
Joshua Mccloskey
cbeeed9942
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
2019-09-05 16:00:59 -07:00
Joshua Mccloskey
820c723e59
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
2019-09-05 15:59:59 -07:00
Joshua Mccloskey
fde49ec3ad
Merge "Modified text to cancel enrollment" into qt-r1-dev
2019-09-05 22:44:12 +00:00
Xin Li
e99e27e78a
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d7a8e234e9 -s ours am: 377369bd0d
...
am: 3a8baab596
2019-09-05 14:29:14 -07:00
Xin Li
3a8baab596
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d7a8e234e9 -s ours
...
am: 377369bd0d
2019-09-05 14:05:27 -07:00
Joshua Mccloskey
f0c7ec75a4
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
...
am: c542abdcaf
2019-09-05 14:04:56 -07:00
Xin Li
377369bd0d
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: d7a8e234e9
2019-09-05 13:32:29 -07:00
Joshua Mccloskey
763e5588ba
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
...
am: 648db67fec
2019-09-05 13:31:50 -07:00
Joshua Mccloskey
27c1468940
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
...
am: 648db67fec
2019-09-05 13:22:56 -07:00
Joshua Mccloskey
c542abdcaf
Merge "Updated security settings string." into qt-r1-dev
...
am: b7ac44e643
2019-09-05 13:17:36 -07:00
Joshua Mccloskey
648db67fec
Merge "Updated security settings string." into qt-r1-dev
...
am: b7ac44e643
2019-09-05 12:50:45 -07:00
joshmccloskey
a55cbf036f
Modified text to cancel enrollment
...
Fixes: 140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
2019-09-05 12:23:44 -07:00
Joshua Mccloskey
b7ac44e643
Merge "Updated security settings string." into qt-r1-dev
2019-09-05 19:22:29 +00:00
Xin Li
d7a8e234e9
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:18 +00:00
Xin Li
7195e05dfa
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
2019-09-04 13:34:43 -07:00
joshmccloskey
e02042d140
Updated security settings string.
...
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
2019-09-03 16:33:39 -07:00
Bill Yi
575d79821a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 6cf0558c80
2019-09-02 09:11:06 -07:00
Bill Yi
342026fa8c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 6cf0558c80
2019-09-02 09:10:52 -07:00
Bill Yi
6cf0558c80
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ife4a90b13e0fea3568f7dd2097184b46cc542237
2019-09-01 23:17:12 -07:00
