Xin Li
aac7f8e2cd
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
2019-09-08 13:06:57 -07: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
Taesu Lee
39e4fbb746
Fix to show eUICC preference in eng build
...
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.
Test: Manual and make RunSettingsRoboTests
Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-09-06 16:11:39 +09: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
Arc Wang
31a79feccd
[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network
...
Should only allow saved network UI initialization for once.
Bug: 140362368
Test: WifiConfigControllerTest
manual:
Manually change EAP method and other security fields for a saved
Wi-Fi neterprise network.
Change-Id: Iddc1dae53849760f43b41b75262358dff6ba09af
Merged-In: Iddc1dae53849760f43b41b75262358dff6ba09af
2019-09-05 14:57:07 +08:00
cosmohsieh
98690197e6
[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection
...
Call NetworkRequestUserSelectionCallback#reject() to notify framework that user quit this request without
selecting any network.
Bug: 138855477
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.NetworkRequestErrorDialogFragmentTest
Change-Id: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
Merged-In: I4b06c9772598ab3f9416f32456cd0a65e2d70d68
2019-09-05 14:22:00 +08: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
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
2019-08-30 19:04:23 -07:00
Bill Yi
7d0a313e1c
[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours
...
am: 42b697c5fa
2019-08-30 19:04:21 -07:00
Bill Yi
231f0109d4
[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0 -s ours
...
am: a8e6569855
2019-08-30 19:04:21 -07:00
Bill Yi
a8e6569855
[automerger skipped] Import translations. DO NOT MERGE
...
am: d595d265f0
2019-08-30 18:57:28 -07:00
Bill Yi
42b697c5fa
[automerger skipped] Import translations. DO NOT MERGE
...
am: d595d265f0
2019-08-30 18:57:26 -07:00
Bill Yi
aa7a7428d6
[automerger skipped] Import translations. DO NOT MERGE
...
am: acf9750118
2019-08-30 18:36:39 -07:00
