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
Bill Yi
10ff483197
[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876
-s ours
...
am: f85844d8e6
-s ours
am skip reason: subject contains skip directive
Change-Id: I71ccaf502f0cff035cfc533f6a1183382b79fdb2
2019-09-05 18:36:03 -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
e2f5f9b876
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 140445577
Change-Id: I162cbffdd4239b49c258bae8df318f7c4ebd0643
2019-09-05 17:10:26 -07:00
Joshua Mccloskey
b8e4bd45c2
Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad
...
am: cbeeed9942
Change-Id: I6a62cccc71ce78f49ab85713b162be1395f8769d
2019-09-05 16:10:00 -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
fde49ec3ad
Merge "Modified text to cancel enrollment" into qt-r1-dev
2019-09-05 22:44:12 +00:00
Joshua Mccloskey
27c1468940
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643
...
am: 648db67fec
Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544
2019-09-05 13:22:56 -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
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
joshmccloskey
e02042d140
Updated security settings string.
...
Test: Manual.
Bug: 140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
2019-09-03 16:33:39 -07:00
Bill Yi
342026fa8c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 6cf0558c80
-s ours
am skip reason: subject contains skip directive
Change-Id: I3e4886467395d5f362668583a56336f2a3e3da3a
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
Bill Yi
7d0a313e1c
[automerger skipped] Import translations. DO NOT MERGE am: d595d265f0
-s ours
...
am: 42b697c5fa
-s ours
am skip reason: subject contains skip directive
Change-Id: I672f90c2d80f4a9141a31211fe5d516a377374b6
2019-08-30 19:04:21 -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
384d1455ed
[automerger skipped] Import translations. DO NOT MERGE
...
am: acf9750118
-s ours
am skip reason: subject contains skip directive
Change-Id: I3d44017502a4a676a80ded624af6698cffde9fba
2019-08-30 18:36:39 -07:00
Bill Yi
67a6005f02
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0969b48cec65b4596c96c0da99714858a6923a3
2019-08-30 17:35:08 -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
a63c2ced9f
[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: I35935d3c0f92a547906346ca014756334dfd9889
2019-08-27 02:12:00 -07:00
Bill Yi
2c4800b4f4
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: 272f241fd4
-s ours
am skip reason: subject contains skip directive
Change-Id: I35eee950f35028f93b5fd93732076ea1e59777b8
2019-08-27 01:18:06 -07:00
Bill Yi
6e9c3ee3b5
[automerger skipped] Import translations. DO NOT MERGE am: 18183ad552
-s ours
...
am: b23b8117ef
-s ours
am skip reason: subject contains skip directive
Change-Id: I7f6ca5313e2ea952b31b12fb8d7611414bbc8e22
2019-08-27 01:17:04 -07:00
Jayachandran Chinnakkannu
ef97b13354
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
...
am: ddc7dda71b
Change-Id: Ie4c47911942926efe0ba8295e9ba9ef05ec98826
2019-08-27 01:14:37 -07:00
Bill Yi
b23b8117ef
[automerger skipped] Import translations. DO NOT MERGE
...
am: 18183ad552
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifd79b8618022e2ae80e21af4e0677f0049304f33
2019-08-27 00:50:02 -07:00
Jayachandran Chinnakkannu
ddc7dda71b
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: Idfbc3f765fc834ab3cb7e07ec340a98606ce87ad
2019-08-27 00:40:42 -07:00
TreeHugger Robot
d9989fc62b
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-08-26 19:04:13 +00:00
Bill Yi
80589d367d
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: 272f241fd4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieaabc566a4f74cc640f6f7bd5ddc4fc66ca45d69
2019-08-26 10:52:55 -07:00
Bill Yi
1168870624
[automerger skipped] Import translations. DO NOT MERGE
...
am: 18183ad552
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaef7f84ffabe3b1238ed4c3f65330fbb9b43ed38
2019-08-26 10:52:18 -07:00
Bill Yi
272f241fd4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a7b5e2abc
-s ours
am skip reason: subject contains skip directive
Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
2019-08-26 10:48:23 -07:00
Bill Yi
c6b2785d65
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9781a780e4
-s ours
am skip reason: subject contains skip directive
Change-Id: I702fcf7582392b0e0b6d20a19844702786a90d5e
2019-08-26 10:47:16 -07:00
Bill Yi
e3cbf6a8d1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
2019-08-26 05:46:44 -07:00
Bill Yi
29e2efdad1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
2019-08-26 05:32:34 -07:00
Bill Yi
9781a780e4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
2019-08-26 05:04:21 -07:00
Bill Yi
18183ad552
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
2019-08-26 04:50:21 -07:00
Bill Yi
2a7b5e2abc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
2019-08-26 04:36:33 -07:00
Jayachandran Chinnakkannu
15a9d54958
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: I2598b482b4630279d47685381ddac9c746fbe12d
2019-08-23 20:31:09 -07:00
Jayachandran Chinnakkannu
7afb9854a7
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
2019-08-24 00:09:32 +00:00
Arc Wang
4301d96b42
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
...
am: 318be48d07
Change-Id: I8e8a4ed08b3dd685f5c08b3503334bb736ef5601
2019-08-22 22:23:56 -07:00
TreeHugger Robot
318be48d07
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
2019-08-23 05:04:35 +00:00
Bonian Chen
128de7bdb6
[Settings] hide preferred network mode UI
...
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.
Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
atest EnabledNetworkModePreferenceControllerTest
Manual with AT&T SIM card in out of servce and in service
Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-08-22 14:36:12 -07:00
TreeHugger Robot
1faba0465a
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-08-22 17:11:06 +00:00
Bill Yi
836cdce5b4
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours
...
am: 32c8779c92
-s ours
am skip reason: subject contains skip directive
Change-Id: Id03ec76072cd7cf7e39133adbf7c8911c261434f
2019-08-22 09:10:53 -07:00
Bill Yi
7026183341
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: I0ad889879219af3ac9f9ccbaac40caecadd1ebef
2019-08-22 08:54:34 -07:00
Bill Yi
32c8779c92
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours
...
am: b227fad96a
-s ours
am skip reason: subject contains skip directive
Change-Id: I7257f9247032fe4fe119610faf8c7df27122c365
2019-08-22 08:54:33 -07:00
Bill Yi
b227fad96a
[automerger skipped] Import translations. DO NOT MERGE
...
am: e6c59cd920
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
2019-08-22 08:40:36 -07:00
TreeHugger Robot
962c472b26
Merge "Import translations. DO NOT MERGE" into qt-qpr1-sysui-dev
2019-08-22 15:03:15 +00:00
Bill Yi
fdc3164ce7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I38f3254282525e8874304943e3acd8289168d493
2019-08-22 03:52:06 -07:00