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
Change-Id: Iad6b5b3e8a637b910227d5cba56e09c8f075d4be
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
Change-Id: Id8701b96d5fa1418cf020339d8b8b11a6ae07388
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
Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840
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
Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a
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
Bill Yi
5a7ae4f046
[automerger skipped] Import translations. DO NOT MERGE am: 53e826122d
-s ours
...
am: 8d9317075c
-s ours
am skip reason: subject contains skip directive
Change-Id: I996bc04b56ca7193f37e45c668156dc142e2865e
2019-09-07 18:39:45 -07:00
Bill Yi
8d9317075c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 53e826122d
-s ours
am skip reason: subject contains skip directive
Change-Id: Idcf6bcf772195798c2853d81e1ab6623b17bf8df
2019-09-07 18:27:34 -07:00
Bill Yi
76517fd1b2
[automerger skipped] Import translations. DO NOT MERGE am: 53e826122d
-s ours
...
am: c47b5e1943
-s ours
am skip reason: subject contains skip directive
Change-Id: I2077d19fea3c18f021f13eef7fee86e43e45cd66
2019-09-06 17:58:14 -07:00
Bill Yi
c47b5e1943
[automerger skipped] Import translations. DO NOT MERGE
...
am: 53e826122d
-s ours
am skip reason: subject contains skip directive
Change-Id: I79de9a02a1f3aefd51e6d436b939fc562bf3af72
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
Change-Id: I1e6228b5e4ecf10aa58bd41d2d8019b3d727b935
2019-09-06 01:47:19 -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
-s ours
am skip reason: subject contains skip directive
Change-Id: I4a78368e63d392970943461484cb996bb9604167
2019-09-05 18:36:05 -07:00
Bill Yi
8675e85259
[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876
-s ours
...
am: 059dddf30e
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic2924bf0d5e799b623c62419029e2576833b79c1
2019-09-05 18:36:04 -07:00
Bill Yi
f85844d8e6
[automerger skipped] Import translations. DO NOT MERGE
...
am: e2f5f9b876
-s ours
am skip reason: subject contains skip directive
Change-Id: I0a5fec1d9bb34749d2add5aa4691007208c6b2b6
2019-09-05 18:30:04 -07:00
Bill Yi
059dddf30e
[automerger skipped] Import translations. DO NOT MERGE
...
am: e2f5f9b876
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib855906069bdfa6390895a92091cb28dbe9fd943
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
Change-Id: Ia5e7d90e2348cb9ae30a769532f0969e632b2814
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
Change-Id: Ib3f4d6c66e1cbe2dbdda9b8ae1bbf8ace74877dd
2019-09-05 16:10:01 -07:00
Joshua Mccloskey
cbeeed9942
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
Change-Id: I7691e528d2ceb433509558885ad8af750ddc6678
2019-09-05 16:00:59 -07:00
Joshua Mccloskey
820c723e59
Merge "Modified text to cancel enrollment" into qt-r1-dev
...
am: fde49ec3ad
Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
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
Change-Id: If7ff85c16d821207f67a52224afcb7edf539d415
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
Change-Id: Id7cae58babeb74b53bc047a2098fe05b06fbc066
2019-09-05 14:05:27 -07:00
Joshua Mccloskey
f0c7ec75a4
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
...
am: c542abdcaf
Change-Id: I710540bf4b92950876f6f39031b8b84d49bea0e8
2019-09-05 14:04:56 -07:00
Xin Li
377369bd0d
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: d7a8e234e9
-s ours
am skip reason: subject contains skip directive
Change-Id: I3a3eb2d8dfa2a3a55c55445bffa5ae5565a5ad5d
2019-09-05 13:32:29 -07:00
Joshua Mccloskey
763e5588ba
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
...
am: 648db67fec
Change-Id: Ie8c9b2a05d6b7ac5d02df2936eaf897fce585f3d
2019-09-05 13:31:50 -07:00
Joshua Mccloskey
c542abdcaf
Merge "Updated security settings string." into qt-r1-dev
...
am: b7ac44e643
Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
2019-09-05 13:17:36 -07:00
Joshua Mccloskey
648db67fec
Merge "Updated security settings string." into qt-r1-dev
...
am: b7ac44e643
Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I0dd23993b72e826f8bf6ac8df3542aa7fee88595
2019-09-02 09:11:06 -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
Android Build Merger (Role)
1d0a2a83f6
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0
-s ours am: 42b697c5fa
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-08-31 02:04:35 +00:00
Bill Yi
ba228ef96b
[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0
-s ours
...
am: 42b697c5fa
-s ours
am skip reason: subject contains skip directive
Change-Id: I6c9235549213d93ed0a86b85fe9833216a459e6f
2019-08-30 19:04:23 -07:00
Bill Yi
231f0109d4
[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0
-s ours
...
am: a8e6569855
-s ours
am skip reason: subject contains skip directive
Change-Id: I17fb107cd6be736a43ca5acd38fc2b841dad0a70
2019-08-30 19:04:21 -07:00
Bill Yi
a8e6569855
[automerger skipped] Import translations. DO NOT MERGE
...
am: d595d265f0
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifea9af76e490aafd88aabea7515a69de7e3e2301
2019-08-30 18:57:28 -07:00
Bill Yi
42b697c5fa
[automerger skipped] Import translations. DO NOT MERGE
...
am: d595d265f0
-s ours
am skip reason: subject contains skip directive
Change-Id: I3b7728ea50f17bfcb92153699909602836b9fd27
2019-08-30 18:57:26 -07:00
Bill Yi
aa7a7428d6
[automerger skipped] Import translations. DO NOT MERGE
...
am: acf9750118
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifd28024fc52f4d01f3fecc3c69a391135290ea04
2019-08-30 18:36:39 -07:00
Bill Yi
acf9750118
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I893b442565d5ac2caa0607111c523ecef27c7bf6
2019-08-30 17:04:50 -07:00
Bill Yi
d595d265f0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
2019-08-30 16:49:34 -07:00
Bill Yi
0003d9a87f
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours am: 272f241fd4
-s ours
...
am: 2c4800b4f4
-s ours
am skip reason: subject contains skip directive
Change-Id: Idcc1af57aafcb361f267ab0defd607b6a70361f0
2019-08-27 02:28:55 -07:00
Bill Yi
2153c15c96
[automerger skipped] Import translations. DO NOT MERGE am: 18183ad552
-s ours
...
am: b23b8117ef
-s ours
am skip reason: subject contains skip directive
Change-Id: Iabaa0a3482336a741165f15d9602299fb71a422e
2019-08-27 01:39:27 -07:00