Commit Graph

398 Commits

Author SHA1 Message Date
TreeHugger Robot
5df80504c3 Merge "Change DEFAULT_CARD_COUNT for settings homepage." 2020-01-02 07:39:24 +00:00
Stanley Wang
5ce5349167 Remove the unused slices.
Remove the DataUsageSlice, DeviceInfoSlice and EmergencyInfoSlice.

Fixes: 146994847
Test: robotest
Change-Id: Ic840e9cc93e99b3c0a34eb6536401db34c98eca8
2019-12-30 19:04:49 +08:00
Automerger Merge Worker
1a33a04433 Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd am: 17bc83209f
Change-Id: I99ef0de75926ba951dd27154f0651e97ea826945
2019-12-20 15:56:50 +00:00
Automerger Merge Worker
17bc83209f Merge "Update the behavior of the Dark theme slice" into qt-qpr1-dev am: bc96cf54cd
Change-Id: I9f59dac9b64f2cb0acf31448c10cb0ef5c04da62
2019-12-20 15:35:13 +00:00
Yi-Ling Chuang
288200c27d Change DEFAULT_CARD_COUNT for settings homepage.
In the new design, we only show up to three cards at a time.

Bug: 138754406
Test: robotests
Change-Id: Ie38c3ee4b33068b9ecb4d6dcd3fa71df3fbd7d07
2019-12-20 17:57:33 +08:00
Sunny Shao
5f42f2f7a7 Update the behavior of the Dark theme slice
- Dark theme slice disappear when battery saver is ON.

Bug: 146149658
Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I071014d7f0658db2098e353717afda905f162ecd
2019-12-20 13:25:49 +08:00
TreeHugger Robot
d04ad97133 Merge "Only show Condtionals when the feature flag is on." 2019-12-16 10:36:49 +00:00
Yi-Ling Chuang
9bda9af186 Only show Condtionals when the feature flag is on.
We plan to deprecate Settings Conditionals as it seems
duplicated with quick settings. For now, we set the default
value of this flag to false to disalbe it. OEMs could still
enalbe this feature by setting the flag on.

Bug: 142927361
Test: robotests
Change-Id: Ifaf710caf0045cb185b3a8c3b04f1ce537f67896
2019-12-16 17:13:21 +08:00
Automerger Merge Worker
107cd136a3 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
2019-12-16 08:31:03 +00:00
Automerger Merge Worker
11fa77b023 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
2019-12-16 08:15:54 +00:00
Bonian Chen
1247771b88 [Settings] Adopting public API
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
lesl
ff012f03a8 Wifi Setting: Use SoftApConfiguration for Tether Setting
Bug: 145578449
Test: Manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I02b4dcbb7b6e29b67ecc7356200f3fc3a1007562
2019-12-05 17:28:24 +08:00
Julia Reynolds
aceccce75c Reorganize notification Settings classes
The notification package was getting too big.

Test: make -j64 RunSettingsRoboTests
Fixes: 145224451
Change-Id: I25ba82f42f7a137d8adcce72dcf8089d0e018bdc
2019-11-27 10:02:13 -05:00
Sunny Shao
0a1f43a7c9 Merge "Add a dark theme slice" into qt-qpr1-dev am: 713143df37
am: e565a793be

Change-Id: I7b780475a3439d229a8b94e882372f7086bd02ed
2019-11-18 17:41:25 -08:00
Sunny Shao
e565a793be Merge "Add a dark theme slice" into qt-qpr1-dev
am: 713143df37

Change-Id: Ie026d122cb1aedd629d2860143aace2bdd599ae9
2019-11-18 17:38:13 -08:00
TreeHugger Robot
713143df37 Merge "Add a dark theme slice" into qt-qpr1-dev 2019-11-19 01:26:30 +00:00
Raff Tsai
4950d4cbc0 Fix robolectric error
Fixes: 144551238
Fixes: 144551930
Test: Robolectric
Change-Id: I33851ae2c4a06495f73e8db5d4df0992df5e7f3e
2019-11-18 10:39:22 +08:00
Hunter Knepshield
b0b539946f Merge "Synced the code from master branch" am: 64efbe1240
am: 418ef9973e

Change-Id: I430b9c45d007de822c87733b1eb4fc71b36ff23c
2019-11-15 10:54:38 -08:00
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch"
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
2019-11-15 10:45:58 -08:00
Sunny Shao
abcbc79d7d Add a dark theme slice
Fixes: 142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
2019-11-15 13:41:49 +08:00
Sunny Shao
f3865e9264 Synced the code from master branch
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-14 21:57:12 +08:00
Jason Chiu
21e8231523 Fix Settings creating too many threads unexpectedly
am: 48a0ff4304

Change-Id: I28068c2c68bffd0d97c1286df4f034a1f4a9825d
2019-11-13 09:40:13 -08:00
Jason Chiu
48a0ff4304 Fix Settings creating too many threads unexpectedly
Limit the number of threads by using the shared thread pool in
ThreadUtils.

Bug: 143434413
Test: manual
Change-Id: I4afe1f641a11e218616772c1d5446efcc99cd1cc
Merged-In: I4afe1f641a11e218616772c1d5446efcc99cd1cc
(cherry picked from commit 3e4c47dbc0)
2019-11-12 08:24:10 +00:00
Raff Tsai
16a81eb3f6 Sync lastest lifecycle interface
Bug: 142938506
Test: rebuild
Change-Id: I6a8d75e5a3ba8564cfb400a88d6582c962c965ee
2019-11-11 16:19:07 +08:00
Sunny Shao
0f844d168b Use the getBidiFormattedPhoneNumber to replace getFormattedPhoneNumber
Fixes: 123698996
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-08 16:36:33 +08:00
Roshan Pius
f13145b323 Settings: Use public API for mac randomization support
Also, don't directly reference the default tether ssid overlay. This info
should always be retrieved from wifiManager.
This ensures that we don't use wifi overlays in settings.

Bug: 143464763
Test: atest com.android.server.wifi
Change-Id: I893a4ca0f4243e1eb6f9c8bef810d0b4a493fb88
2019-11-06 07:58:19 -08:00
Xin Li
c73fd84126 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: Ibae6b218a616a93cfda05dd77a5ea6f3a2dc4cea
2019-10-30 11:49:56 -07:00
Jason Chiu
3e4c47dbc0 Fix Settings creating too many threads unexpectedly
Limit the number of threads by using the shared thread pool in
ThreadUtils.

Bug: 143434413
Test: manual
Change-Id: I4afe1f641a11e218616772c1d5446efcc99cd1cc
2019-10-29 17:19:04 +08:00
Xin Li
52bb254eea Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
2019-10-25 10:28:05 -07:00
Raff Tsai
138fcb715d Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691 am: 9dbbf88d14
am: 6f99052cbc

Change-Id: Ie582c8628b267c26de965d6c990a3998e6f6d277
2019-10-24 19:13:56 -07:00
Raff Tsai
6f99052cbc Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691
am: 9dbbf88d14

Change-Id: I52f7724fc50af20888d31821dc56732186a07c84
2019-10-24 19:08:08 -07:00
Raff Tsai
81e9c58691 Merge "Skip loading contextual cards if legacy cards are used"
am: c53771e80a

Change-Id: Idae5d4948edc9767afae23f2fcbbd522410654b5
2019-10-24 18:51:50 -07:00
Daniel Hunt
dfd5e4fed5 Skip loading contextual cards if legacy cards are used
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,

Bug: 142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
2019-10-20 15:46:39 +00:00
Yi-Ling Chuang
19c2a20d9a Add onErrorListner for SliceLiveData
SliceLiveData is changed in the framework, where the way it handles null
slices is different. Thus, we handle the case of null slices by adding
onSliceError() to make slice refreshing back to normal and to prevent
from non responding action on slices.

Fixes: 141293788
Test: visual
Change-Id: I4751d57ae478eec66a1a951841d36521556cacd7
2019-10-01 15:21:21 +08:00
joshmccloskey
be7d733886 Added different flow for re-enrollment am: bba7632f28
am: 3511ad89ca

Change-Id: I2b06407f4df37f8d16f95c6068de0ac3523df293
2019-09-27 18:38:20 -07:00
joshmccloskey
3511ad89ca Added different flow for re-enrollment
am: bba7632f28

Change-Id: Ie5174848a3a35df197177b0aa2cf6c324813b8dd
2019-09-26 20:06:48 -07:00
joshmccloskey
bba7632f28 Added different flow for re-enrollment
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.

Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.

Bug: 141380252
Bug: 141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
2019-09-26 23:54:59 +00:00
Raff Tsai
966fa01423 Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
2019-09-25 18:24:56 +08:00
Raff Tsai
ac3e0d0988 Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
2019-09-24 00:35:52 +08:00
Yi-Ling Chuang
fe790ec76d Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc am: 8d8c3e19b5 am: b26711944b
am: 3b8a14e86f

Change-Id: I97bcdc54f908db6f5895d99f284ee24fb4015433
2019-09-22 20:23:28 -07:00
Yi-Ling Chuang
3b8a14e86f Merge "Enable dismissal feature on legacy suggestions." am: ee39335edc am: 8d8c3e19b5
am: b26711944b

Change-Id: I0edf1eff42cf54e644e60a11ba97219c38891e93
2019-09-22 20:16:25 -07:00
Yi-Ling Chuang
8d8c3e19b5 Merge "Enable dismissal feature on legacy suggestions."
am: ee39335edc

Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
2019-09-22 20:03:21 -07:00
Yi-Ling Chuang
83ac0efd81 Enable dismissal feature on legacy suggestions.
Add back the close button for legacy suggestions.

Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
2019-09-20 18:03:10 -07: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
Yi Jiang
943e7b34e8 Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
am: 7933af0273

Change-Id: Ibb750cc10763ade05e3f611a22e602ea3ebe7d5e
2019-08-12 18:41:16 -07:00
Yi Jiang
7933af0273 Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev 2019-08-13 01:28:31 +00:00
Yi Jiang
811908f568 Don't show suggestion slice if 'Screen attention' is already on
Bug: 137259771
Fix: 137259771
Test: Manually

Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
(cherry picked from commit 06f0bd6d4e)
Merged-In: I5568b569ecd4db943f1a239c7ddcd2923bec4028
2019-08-05 17:06:24 +00:00
Sunny Shao
647e49e7cf Add Tapjacking Protection for SettingsHomepageActivity
Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from
SettingsHomepageActivity and SettingsPanelActivity with lifecycle.

Bug: 138442483
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
      manual test
Change-Id: I72f9a947f57f74a8c09127d6c39173594c248ddc
2019-08-01 23:36:12 +08:00
Julia Reynolds
104bc8e133 Merge "Move channel listing into a pref controller" into qt-qpr1-dev
am: 2d035ddfa2

Change-Id: Ie6d1c1ec4fdd2c074884d258379889bdb120a0d4
2019-07-29 13:24:07 -07:00
Julia Reynolds
c400ce3c80 Move channel listing into a pref controller
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.

Also delete some unused code that no longer complied after
this refactor.

Fixes: 133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
(cherry picked from commit a295d71c94)
2019-07-26 19:24:43 +00:00