PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,982 Commits 1 Branch 0 Tags
0a1f43a7c94764d733e40e70756de2ac6cdaec3c
Commit Graph

56982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
a0027cd10a Merge "[Wi-Fi] Fix robolectric test broken" 2019-09-10 05:39:30 +00:00
TreeHugger Robot
e713b0379e Merge "Fix the title font problem in the System Navigation page" 2019-09-10 04:48:29 +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
Sunny Shao
44ae2a898f Fix the title font problem in the System Navigation page 
Use the textAppearanceListItem of the attribute to replace the text font of title.

Fixes: 140532398
Fixes: 140771643
Test: manual view
Change-Id: Ieb3a8a73680e1b1804a058e6c413d27aad772ba6
 2019-09-10 11:12:42 +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
Miranda Kephart
28812b0feb Merging from qt-qpr1-sysui-dev @ build 5855545 
Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
 2019-09-09 21:32:22 +00:00
Miranda Kephart
e9963e37d5 Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545 
Test: manual, presubmit on the source branch

Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Change-Id: Ieea5138da3d182735fb92eedd607f52750c91e19
 2019-09-09 20:27:44 +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
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
d70e5c23e6 [automerger skipped] Import translations. DO NOT MERGE am: 53e826122d -s ours am: 8d9317075c -s ours 
am: 5a7ae4f046 -s ours
am skip reason: subject contains skip directive

Change-Id: I463b94a122f9779696b005ca66a64feb011a5457
 2019-09-07 18:52:31 -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
728f836d4d [automerger skipped] Import translations. DO NOT MERGE am: 53e826122d -s ours 
am: 8d9317075c -s ours
am skip reason: subject contains skip directive

Change-Id: I827558296e4ebcdd2e1345e156e73dab3c70ae0c
 2019-09-07 18:38:10 -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
8fbd85fa30 [automerger skipped] Import translations. DO NOT MERGE am: 53e826122d -s ours am: c47b5e1943 -s ours 
am: 76517fd1b2 -s ours
am skip reason: subject contains skip directive

Change-Id: I66a0378c5e3a3066481af47015d1a33263afb587
 2019-09-06 18:05:15 -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
Joshua Mccloskey
f970bbf68b Merge "Fixed talkback issue on confirm lock password." 2019-09-06 20:59:28 +00:00
Miranda Kephart
fd8a005c60 Merge "Merging from qt-qpr1-sysui-dev @ build 5855545" 2019-09-06 19:30:55 +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
Miranda Kephart
314cd4a479 Merging from qt-qpr1-sysui-dev @ build 5855545 
Test: manual, presubmit on the source branch

Change-Id: Idc3d5c39427722a5486552312552f7f77ef40980
 2019-09-06 18:27:33 +00:00
TreeHugger Robot
00d05566be Merge "Prevent accounts page directly opening in screen pinning mode" 2019-09-06 17:19:29 +00:00
Raff Tsai
c41ea65c99 Fix Settings crash when click uninstall button am: 2d709131ba 
am: 6f8797f86c

Change-Id: I9e1853eadccf8286954d179993a147d4cf3bb72b
 2019-09-06 09:57:27 -07:00
Bill Yi
b7399d165b Merge "[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876 -s ours am: f85844d8e6 -s ours 
am: 3b0a921326 -s ours
am skip reason: subject contains skip directive

Change-Id: I2cb11a18155f85359ecd0e6a2ed923e59aae5ce8
 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 -s ours
am skip reason: subject contains skip directive

Change-Id: I7cde451218f5e28743f2a802fa3a78f404048682
 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

Change-Id: I1ecd3d66a6bb9b007f99db3cb584e44cde5d0b0e
 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

Change-Id: Ieee4ec198c800840b81563e20306ccbb193a2a96
 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 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia85fd6d759763ef7535e29b0a9c4f3fd990f7863
 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

Change-Id: I0bbf7c38f0a2d10b13e18c136195dc25b45cb4db
 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

Change-Id: Ib908440e3becea85800efa2a25652fa81bd087a5
 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.

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
6748951f07 Fix Settings crash when click uninstall button 
am: 2d709131ba

Change-Id: I5e7c8f9e5ea9ac6854be24ddd025ee0849a200cf
 2019-09-06 01:47:16 -07:00