Bill Yi
b7399d165b
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours am: f85844d8e6 -s ours
...
am: 3b0a921326
2019-09-06 09:56:58 -07:00
Bill Yi
2765d1a310
[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours am: 059dddf30e -s ours
...
am: 8675e85259
2019-09-06 09:56:26 -07:00
Joshua Mccloskey
5c721181c3
Merge "Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad am: cbeeed9942" into qt-qpr1-dev-plus-aosp
...
am: cd7f47f582
2019-09-06 09:55:53 -07:00
Joshua Mccloskey
f514390246
Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad am: 820c723e59
...
am: 0ec126ead9
2019-09-06 09:55:19 -07:00
Xin Li
859a42ca24
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d7a8e234e9 -s ours am: 377369bd0d am: 3a8baab596
...
am: e99e27e78a
2019-09-06 09:54:22 -07:00
Joshua Mccloskey
18f1908d26
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643 am: c542abdcaf
...
am: f0c7ec75a4
2019-09-06 09:52:11 -07:00
Joshua Mccloskey
cbb4e70efc
Merge "Updated security settings string." into qt-r1-dev am: b7ac44e643 am: 648db67fec
...
am: 763e5588ba
2019-09-06 09:49:44 -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
Mill Chen
14ed4a0efd
Prevent accounts page directly opening in screen pinning mode
...
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.
Bug: 137015265
Test: manual
Change-Id: Ice2250eb00be9d2181901cef6d1f04b4a8233bfc
2019-09-06 21:09:53 +08:00
TreeHugger Robot
ea43780693
Merge "Revert "Prevent accounts page directly opening in screen pinning mode""
2019-09-06 11:13:40 +00:00
Mill Chen
348234565a
Revert "Prevent accounts page directly opening in screen pinning mode"
...
This reverts commit f3242dab35
2019-09-06 09:18:23 +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
Yanting Yang
cb3574c7d6
Merge "Set phone number preference unselectable"
2019-09-06 01:56:45 +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
TreeHugger Robot
7b808faefc
Merge "Set the content description of pin/password boxes"
2019-09-06 01:21:06 +00: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
TreeHugger Robot
e90244ba5f
Merge "Fix Battery usage page refresh issue"
2019-09-05 17:14:15 +00:00
Xin Li
d7a8e234e9
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:18 +00:00
Yanting Yang
afe788ca19
Set phone number preference unselectable
...
For multiple sim case, there are two or more phone number preferences in
About page. They should be grayed out because they don't have actions.
Fixes: 138263122
Test: Visual
Change-Id: I86ec37d049983c23b8990dda0e12bfadebf70d1e
2019-09-05 22:22:10 +08:00
TreeHugger Robot
8703bb99b1
Merge "Fix upper back button behavior of LocationSettingsActivity"
2019-09-05 10:34:41 +00:00
TreeHugger Robot
9ea11ac24d
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network"
2019-09-05 10:09:32 +00:00
Yanting Yang
5edcc30ada
Fix upper back button behavior of LocationSettingsActivity
...
In acrossing different apps, it should go back to previous app if user
click the upper back button on LocationSettingsActivity. So remove the
android:parentActivityName attribute of LocationSettingsActivity from
AndroidManifest.
Fixes: 140370314
Test: visual
Change-Id: I1efa750f1371a313c83844a67862d903cfe65bf6
2019-09-05 16:25:17 +08:00
Arc Wang
9db4bf7dbb
[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
2019-09-05 16:07:08 +08:00
Jimmy Chen
3612d3ebc9
wifi: support OCSP in Wifi dialog for certifiate-based EAP type
...
Bug: 136720092
Test: tested with OCSP supported profile
Change-Id: Ieb0fec5026ea06f88d44361d0c579be2a18ed99a
2019-09-05 15:39:12 +08:00
Raff Tsai
577240642d
Fix Battery usage page refresh issue
...
restartBatteryStatsLoader made a loader existed in fragment. onStart
will resume the loader. onResume registers mBatteryBroadcastReceiver
will caused the loader activated the second time. We move
restartBatteryStatsLoader to onStart can reduce the loader runs only
once.
Fixes: 140488811
Test: manual
Change-Id: I4cac574ea8e9c07c1a9df48a57fb8140d5687b21
2019-09-05 14:37:21 +08:00
Cosmo Hsieh
b2e5ebee4a
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection"
2019-09-05 03:53:57 +00:00
