Commit Graph

23703 Commits

Author SHA1 Message Date
TreeHugger Robot
7f050853c1 Merge "Add conditional cards to the new homepage." 2018-09-05 01:50:08 +00:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
TreeHugger Robot
d6d4c1681a Merge "Fix keyguard checking when installing user certs." 2018-09-04 20:28:26 +00:00
Pavel Grafov
1613c71248 Fix keyguard checking when installing user certs.
Currently the condition is inverted, so the user is asked to enroll
a password only when there is one already.

Also, use existing method instead of a duplicate one. LPU.isSecure doesn't
check the credential owner, but for unified lock with empty parent password
it will correctly return false, so should be correct.

Bug: 113646620
Test: manual, tried installing user certs with and without screen lock.
Change-Id: Iabb1614540e454873e48039be13e22cc89b0a7be
2018-09-04 18:17:04 +01:00
Philip P. Moltmann
8a33bd5947 Merge "RestrictedLockUtils was split into ...Internal" 2018-08-31 04:47:28 +00:00
Emily Chuang
307d209322 Add conditional cards to the new homepage.
Make existing Settings Conditions show up in the new homepage as custom
view.

Bug: 113451905
Test: robotests
Change-Id: Ic49089f95ff04442a887cda97481e945136f7209
2018-08-31 09:34:22 +08:00
TreeHugger Robot
847865dca8 Merge "Update Settings to match Framework" 2018-08-31 01:21:07 +00:00
Doris Ling
22c078c8de Remove the deprecated class DataUsageBase.
- and update all its subclass to extend DataUsageBaseFragment instead.

Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: Ic5720af43082d8b39642b6a539515f3f20d32694
2018-08-30 14:16:13 -07:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
timhypeng
3029efc5f7 call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager
-add test case "onGetDeviceName"

Bug: 112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Id62b6eb8be38fb6ac69ca371563be899b8d61aff
2018-08-30 08:06:19 +00:00
Raff Tsai
a59ce66b3b Merge "Close searchActivity doesn't go back to previous activity" 2018-08-30 01:08:24 +00:00
Raff Tsai
4778a9afbd Close searchActivity doesn't go back to previous activity
When requestCode is 0, we will not finish activity.

Change-Id: Ib630951739031b05c83efe189875a4a41c8e51ec
Fixes: 113372155
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password"
2018-08-29 23:31:42 +08:00
TreeHugger Robot
68d39ba1ee Merge "Grant permission on slice uris based on whitelist" 2018-08-29 14:11:16 +00:00
TreeHugger Robot
a3738857da Merge "Add null check for vrManager" 2018-08-29 10:02:09 +00:00
Kevin Chyn
76d40d3efb Update Settings to match Framework
Bug: 72825012
Test: atest SettingsRoboTests

Change-Id: Ie59347bcb5d6748b3e684541b390c8e5f6db3f4a
2018-08-28 21:45:01 -07:00
Fan Zhang
d480c0e41a Grant permission on slice uris based on whitelist
Bug: 112587202
Test: robotests
Change-Id: I4e12a73f0acd848153f32c2569358dd55bed3f92
2018-08-28 18:13:25 -07:00
Fan Zhang
c21f4a512a Merge "Sort imports" 2018-08-29 00:19:53 +00:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
TreeHugger Robot
099eab1e05 Merge "Turn down app indexing for slices." 2018-08-28 22:08:41 +00:00
Treehugger Robot
6e2db2c34b Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" 2018-08-28 21:54:01 +00:00
Fan Zhang
44a12fc5ee Turn down app indexing for slices.
Bug: 112587202
Test: robotests
Change-Id: Ice84173bd9617f58689438c460522104776c46ce
2018-08-28 13:43:08 -07:00
hjchangliao
bc7b20b419 DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests

Remove OverlayManagerWrapper class out from Settings

Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
2018-08-28 13:38:21 -07:00
Fan Zhang
07e55d97ca DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates

- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings

The task affinity is messing with the back stack for this activity when
launched externally

Fixes: 80281932
Fixes: 80290571
Test: manual

Disable uninstall update option for secondary users.

Fixes: 110249550
Test: manual

Suppress some gesture search when there is no hardware

Fixes: 110250839
Test: robotests

Check wifi password length by byte, not char.

Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes: 79209073
Test: robotest
2018-08-28 12:17:03 -07:00
Aurimas Liutikas
b1af85d155 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
2018-08-28 11:48:56 -07:00
TreeHugger Robot
ed3373d86d Merge "Remove unneeded getDisplayableCards() in DashboardAdapter" 2018-08-28 18:36:23 +00:00
Fan Zhang
35ed23e8bf Remove unneeded getDisplayableCards() in DashboardAdapter
It will be called when window gets focus, no need to call it here.

Change-Id: I1c4b3b745edb2519e778f8354684d90e2eb55004
Fixes: 113175600
Test: manual
2018-08-28 10:26:19 -07:00
TreeHugger Robot
f0542f0c25 Merge "Clean up the main architecture of Contextual Settings Homepage." 2018-08-28 16:02:42 +00:00
Christine Franks
036ca19897 Merge "Remove demo restrictions" 2018-08-28 15:45:35 +00:00
TreeHugger Robot
d83c1b92d2 Merge "Updated the CardContentProvider" 2018-08-28 15:04:26 +00:00
TreeHugger Robot
064af9a48e Merge "Show bonded devices in "Pair new device"(2/2)" 2018-08-28 14:32:04 +00:00
Emily Chuang
ae90591749 Clean up the main architecture of Contextual Settings Homepage.
- Add lifecycle observer in HomepageManager.
- Rename some variables.

Bug: 111676964
Test: robotests
Change-Id: Ic91c53f2c1622d602b3edc664a06a13aa6945f47
2018-08-28 21:43:47 +08:00
Rick Yiu
bad519d0a4 Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.

Test: robotests
Bug: 112064298
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
2018-08-28 16:03:40 +08:00
Sunny Shao
fb80ec21c2 Updated the CardContentProvider
- Removed the availability_uri field
- Changed the card_action data type to integer
- Added the support_half_width field
- Modify the Database version to 2

Bug: 111820446
Test: robotest
Change-Id: I755ad93a05034037bab18e709f53b4af3ce4fe5e
2018-08-28 12:39:10 +08:00
Ash_Chen
8f7092a15e Show bonded devices in "Pair new device"(2/2)
Some users forgot they had paired devices and couldn't see their BT device
when they search device in "Pair new device". (b/80382940, b/80133137).
Need to change the behavior to let paired devices can be shown on "Available devices".

Bug: 111738593
Test: Bluetooth Pairing Test
Change-Id: Ib499785abaa8e4efc1875be113ac87bdbe0c89ba
2018-08-28 11:39:38 +08:00
SongFerng Wang
937b8172b2 Merge "SIM status page sync signal strength and service state behavior from systemUI" 2018-08-28 02:40:02 +00:00
Christine Franks
be2370db13 Remove demo restrictions
These are now available as user restrictions.

Bug: 113298946
Test: make RunSettingsRoboTests -j100
Change-Id: I637083c8edcf43b99cebbf5a7dfd60afee441ade
2018-08-27 18:45:24 -07:00
Aurimas Liutikas
a290b873d0 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
2018-08-27 18:24:23 -07:00
Doris Ling
8741c04821 Add log when the advanced button is clicked.
- register the advanced button expand listener and add the metrics log
when it is clicked.

Fixes: 70930626
Test: make RunSettingsRoboTests

Change-Id: Ife4af4bd4a0a8534cf9ba63949660a810b09446a
2018-08-27 14:23:13 -07:00
Doris Ling
323e54ddf5 Merge "Fix crash in clicking Default Home gear icon." am: 0c724f5181
am: 51a72d4c38

Change-Id: I7ff6b0e405c3d87faa869bd53eee9983648ccf69
2018-08-25 23:24:51 -07:00
Doris Ling
51a72d4c38 Merge "Fix crash in clicking Default Home gear icon."
am: 0c724f5181

Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad
2018-08-25 23:12:24 -07:00
TreeHugger Robot
a60d914d5f Merge "Create the main architecture for Settings Dynamic Homepage" 2018-08-25 01:09:17 +00:00
TreeHugger Robot
b619dd8856 Merge "Fixed NPE that crashes Settings." 2018-08-24 23:50:11 +00:00
Emily Chuang
6cb08a3ce4 Create the main architecture for Settings Dynamic Homepage
Create an architecture for the homepage to enable card adding
and displaying.

Bug: 111676964
Test: robotests
Change-Id: I06efe3d16585060a8e99313586ae29bbde7fe3e8
2018-08-25 07:47:23 +08:00
Doris Ling
72836a99d2 Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.

Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes: 112249115
Test: make RunSettingsRoboTests
2018-08-24 15:56:38 -07:00
TreeHugger Robot
a5aba37da7 Merge "Add Support for Virtual High Refresh Rate mode" 2018-08-24 21:33:27 +00:00
TreeHugger Robot
f566949d78 Merge "Fix crash in clicking Default Home gear icon." 2018-08-24 20:13:36 +00:00
TreeHugger Robot
07af8e015f Merge "Refresh conditions only when it changes." 2018-08-24 19:50:24 +00:00
Doris Ling
639ad90313 Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.

Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes: 112249115
Test: make RunSettingsRoboTests
2018-08-24 11:27:18 -07:00
Fan Zhang
5d7ebbf963 Refresh conditions only when it changes.
- Instead of force refresh when user tap action button, we not wait
  until state changes for each conditional cards.

Test: robotests
Change-Id: I2eca59a06b8cb332b7b99f017baefb3d5b53234b
2018-08-24 09:25:57 -07:00