Commit Graph

28354 Commits

Author SHA1 Message Date
Ilya Matyukhin
51ac1a881e Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev am: 3df43a3eae
am: 4dfe356797

Change-Id: Id0fe0d8c491a76bed3108c59acf3bb7d7179101c
2019-09-13 02:34:52 -07:00
Ilya Matyukhin
4dfe356797 Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
am: 3df43a3eae

Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
2019-09-13 02:28:52 -07:00
Ilya Matyukhin
3df43a3eae Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev 2019-09-13 09:10:32 +00:00
Ilya Matyukhin
a95459c640 Fix "skip lock screen" not working for a secondary user
Bug: 140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
2019-09-13 09:10:15 +00:00
cosmohsieh
7aee812888 Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
am: 17cbea0112

Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
2019-09-12 14:09:30 -07:00
TreeHugger Robot
17cbea0112 Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev 2019-09-12 20:49:56 +00:00
Arc Wang
40f22313dc Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
am: ec3055b9eb

Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
2019-09-12 01:14:57 -07:00
TreeHugger Robot
ec3055b9eb Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev 2019-09-12 08:05:21 +00:00
Raff Tsai
1f30b1cd67 Merge similar BaseSearchIndexProvider code together
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
2019-09-12 11:09:09 +08:00
Mady Mellor
88de4328fd Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp 2019-09-11 22:40:20 +00:00
TreeHugger Robot
1171eb2eca Merge "Use TwoTargetPreference to replace customized layout" 2019-09-11 08:35:37 +00:00
Raff Tsai
98b55c5214 Use TwoTargetPreference to replace customized layout
Bug: 139336138
Test: manual, robolectric
Change-Id: I0ffe90cd9ab5423b533507eeae47d5972704cf61
2019-09-11 13:08:47 +08:00
Raff Tsai
883cdcf87c Merge "Fix settings panel refresh issue" 2019-09-11 04:58:06 +00:00
Arc Wang
384f17707f Merge "[Wi-Fi] Change material design Wi-Fi signal icon for Wi-Fi Direct" 2019-09-11 01:47:38 +00:00
Al Sutton
1fef77dd90 Add alsutton@ to OWNERS for backup settings
Bug: 140479949
Test: build/make/tools/checkowners.py -c -v
packages/apps/Settings/src/com/android/settings/backup/OWNERS
Change-Id: I373aa0521feb0da8c4c5d98a7199ea9ca848123a
2019-09-10 14:45:56 +01:00
joshmccloskey
aa5415f269 Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50 am: 349e664035
am: 56e312b2a3

Change-Id: I7633b25ef87117b8f3a65861c525531f1a2ccbd0
2019-09-09 23:32:36 -07: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
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
Arc Wang
30c1767c0a [Wi-Fi] Fix robolectric test broken
1. WifiConfigController#setSelection triggers onItemSelect, it uses
   mEapUserCertSpinner without adapter.
2. refreshSummary should use parameter preference instead of mPreference.

Bug: 140771897
Test: WifiConfigControllerTest
      WifiWakeupPreferenceControllerTest

Change-Id: I963260bd82e7387052cacae89bdbe46da841e341
2019-09-10 11:41:35 +08:00
Raff Tsai
9bd767b052 Merge "Fix testcase error and UI refresh issue" 2019-09-10 00:47:24 +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
Mady Mellor
ea79e343f0 qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
2019-09-09 21:48:54 +00:00
TreeHugger Robot
0a38ab8f6e Merge "Update slice states when on Voip calling" 2019-09-09 07:56:06 +00:00
TreeHugger Robot
aa7e09ec26 Merge "Revert "Refreshes preference text when updateStates"" 2019-09-09 04:49:14 +00:00
TreeHugger Robot
250ac8fa2a Merge "Revert "Fix subtext didn't change after toggle changed"" 2019-09-09 04:49:14 +00:00
TreeHugger Robot
46a43284a1 Merge "Handle subtext display problem in WifiWakeupPreferenceController" 2019-09-09 04:49:14 +00:00
Raff Tsai
8291671f97 Fix testcase error and UI refresh issue
Restricted App list can be update in RestrictedAppDetails page and
go back to SmartBatterySettings page without update the App list.
We need to update the list in updateState() again.

Fixes: 140585454
Test: manual, robolectric
Change-Id: I48a197351ffb9b07490f1de7ba1f7417102458a2
2019-09-09 12:00:21 +08:00
Sunny Shao
92dbda2af0 Revert "Refreshes preference text when updateStates"
This reverts commit ff6cc9be3c.

Reason for revert: This cl caused some toggle preference just show on/off in the subtext.

Fixes: 138988285
Fixes: 140475264
Fixes: 140536268
Change-Id: I6cc5136205c50ae373fdfb32f2252a1f7a7c51aa
2019-09-09 03:44:58 +00:00
Sunny Shao
4e8081e30a Revert "Fix subtext didn't change after toggle changed"
This reverts commit 5d33399101.

Reason for revert: Subtext must display from its resource xml file, don't just show on/off.

Change-Id: I57a647be1aa2da881caf444c36991da0cdff73f6
2019-09-09 03:05:16 +00:00
hughchen
059cb397cd Update slice states when on Voip calling
This CL is used to register intent of AudioManager.STREAM_DEVICES_CHANGED_ACTION
to know that phone is on VOIP call. When received this intent, media slice will
to update UI. Then if audio mode is on-going call, we will hide the slice UI.

Bug: 132198606
Test: Test: make -j42 RunSettingsRoboTests
Change-Id: Ic17ebd319b3da8f42089d36ba530cfb57c93c4c6
2019-09-09 11:01:44 +08:00
Sunny Shao
0521385003 Handle subtext display problem in WifiWakeupPreferenceController
WifiWakeupPreferenceController subtext can't display location info subtext
when the "Use location" turn off. Now override the updateState and add the
refreshSummary in this api to fix the problem.

Bug: 132391311
Test: manual view
Change-Id: I5e85c1ae9b9393ee06f16a61d4be4a149adfdede
2019-09-09 11:00:41 +08:00
Raff Tsai
24500ce1fd Fix settings panel refresh issue
We use updatePanelWithAnimation() to make old panel animated out
and new panel animated in. But if old panel is in background, we
don't need the animation out process. Use a flag mForceCreation
to check, if activity is onStop() means it is in background, we
don't need the animation.

Fixes: 140541182
Test: manual
Change-Id: I9a2f555dba5417a108ce35fac25a62cf7a8b1d8b
2019-09-09 10:31:18 +08:00
Jimmy Chen
33a05692f0 Merge "wifi: support OCSP in Wifi dialog for certifiate-based EAP type" 2019-09-09 02:23:07 +00:00
Joshua Mccloskey
f970bbf68b Merge "Fixed talkback issue on confirm lock password." 2019-09-06 20:59:28 +00:00
joshmccloskey
50aea6e66b Fixed talkback issue on confirm lock password.
Fixes: 132156012
Test: Verified with BiometricPromptDemo that talkback now
announces the correct password type for PIN/Pattern/Pass.

Change-Id: I3a04fe691140abba40396f95a601f863d87ee394
2019-09-06 11:32:25 -07:00
TreeHugger Robot
00d05566be Merge "Prevent accounts page directly opening in screen pinning mode" 2019-09-06 17:19:29 +00:00
Joshua Mccloskey
f514390246 Merge "Modified text to cancel enrollment" into qt-r1-dev am: fde49ec3ad am: 820c723e59
am: 0ec126ead9

Change-Id: Ieee4ec198c800840b81563e20306ccbb193a2a96
2019-09-06 09:55:19 -07: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.

Reason for revert: use another way to handle this.

Change-Id: I83c97db5189cfda3a09f5249d8591ea91dbd3bcb
2019-09-06 09:18:23 +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
Yanting Yang
cb3574c7d6 Merge "Set phone number preference unselectable" 2019-09-06 01:56:45 +00:00
TreeHugger Robot
7b808faefc Merge "Set the content description of pin/password boxes" 2019-09-06 01:21:06 +00: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