Commit Graph

16618 Commits

Author SHA1 Message Date
Doris Ling
3da90f7f1c Merge "Add subtext to Default apps." into oc-dev
am: 1e775c117a

Change-Id: I5e06cdb4513bbc8e2ee23592e5d90f1a9481f994
2017-04-07 01:54:46 +00:00
Lei Yu
edeb58d023 Merge "Remove PowerUsageDetail.java" into oc-dev am: bde7097fb9
am: 20dcdfe2cf

Change-Id: I612907ccce829d6ac590c5826bc6a1710b5b27dc
2017-04-07 01:47:09 +00:00
TreeHugger Robot
1e775c117a Merge "Add subtext to Default apps." into oc-dev 2017-04-07 01:41:51 +00:00
Lei Yu
20dcdfe2cf Merge "Remove PowerUsageDetail.java" into oc-dev
am: bde7097fb9

Change-Id: If609c5e9814bd2a18f3a8981937b407b2e94de61
2017-04-07 01:39:25 +00:00
Lei Yu
bde7097fb9 Merge "Remove PowerUsageDetail.java" into oc-dev 2017-04-07 01:34:37 +00:00
Jim Miller
d5a3c53733 Don't crash if we get a onRemove() callback from Fingerprint
Before this fix, it was possible to get a callback after the activity
finishes.  This just ensures the operation is a no-op.

Fixes bug 37106041

Test: remove all but last fingerprint and hit back while rotating; check that
Settings doesn't crash.

Change-Id: I99df4f7c06e345d1ed6041a75606b0cc43edb300
2017-04-07 01:22:47 +00:00
TreeHugger Robot
b26584cf1a Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev 2017-04-07 00:42:05 +00:00
Doris Ling
2db8c867d1 Update summary text for Trust agent.
Update the summary text to show the number of active trust agent.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
2017-04-06 17:29:12 -07:00
Doris Ling
d007ff9395 Add subtext to Default apps.
Retrieve the default Sms app, default Browser app, and default Phone app
and append the label together to form the summary text for Default apps
settings.

Bug: 36376411
Test: make RunSettingsRoboTests
Change-Id: I8ccf71dde43bba04c4bc4a900c9a181513e7710b
2017-04-07 00:10:39 +00:00
Daniel Nishi
54cadd92d9 Merge "Re-add the option to migrate data back." into oc-dev
am: c660755348

Change-Id: I875d8175577011d422c0105f232d26fdbaf04703
2017-04-06 23:04:36 +00:00
Daniel Nishi
c660755348 Merge "Re-add the option to migrate data back." into oc-dev 2017-04-06 22:49:24 +00:00
Andrew Zeng
233d88a277 Use MIN_LOCK_PASSWORD_SIZE as min password length.
Currently MIN_LOCK_PASSWORD_SIZE=MIN_LOCK_PATTERN_SIZE, so there
shouldn't be any behavior changes stemming from this.

Change-Id: I15369723e7fd0cc3fe8230c9b450faf929fefd00
2017-04-06 15:39:58 -07:00
jackqdyulei
ab5ca9f5cd Remove misc data in battery main page.
The removed types are:
1. DrainType.UNACCOUNTED
2. DrainType.OVERCOUNTED

This cl removes the above types in PowerUsageSummary and
PowerUsageAdvanced

Bug: 36874846
Test: RunSettingsRoboTests
Change-Id: I1807c44a2c0a9c2fa124cdef962a6411ae6830ca
2017-04-06 15:09:57 -07:00
Daniel Nishi
f6b12274f1 Re-add the option to migrate data back.
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.

One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.

By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.

Change-Id: Id0e01c560e7249acccfe86c5da44466dd58fe5d4
Merged-In: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes: 35926028
Test: Settings Robotest
2017-04-06 13:57:00 -07:00
Doris Ling
76c325d46c Merge "Add summary text to Display->Brightness level." into oc-dev am: ad69c46712
am: c48ef6dda1

Change-Id: Id4d194f010c07d7d731238600f80dd18589a0358
2017-04-06 20:37:22 +00:00
Daniel Nishi
f588f7678d Add a movies & tv apps category to storage settings.
Change-Id: I055e93d2a151195b90a5fd64f4fddebbbcffef59
Merged-In: Idfabe83739272b19cbef4b13a82339170f8f97b3
Fixes: 36223441
Test: Settings Robotest
2017-04-06 13:36:12 -07:00
Daniel Nishi
bf1f8e9ca7 Fake the cache size to be 0 bytes when cleared.
The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.

It will not be zero if the user exits and comes back, but this
should be fine.

MARK IT ZERO!

Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
2017-04-06 13:35:09 -07:00
Doris Ling
c48ef6dda1 Merge "Add summary text to Display->Brightness level." into oc-dev
am: ad69c46712

Change-Id: I6e838fae7cdb2cffab830c73db0c09a5d246437a
2017-04-06 20:33:14 +00:00
Doris Ling
ad69c46712 Merge "Add summary text to Display->Brightness level." into oc-dev 2017-04-06 20:03:24 +00:00
Doris Ling
eff691280a Merge "Update summary for Connected devices->Printing." into oc-dev am: 4bbfdb13e7
am: 38fc861a62

Change-Id: I6329d63106ce55d324c284126459f03aea614ef5
2017-04-06 19:21:53 +00:00
Doris Ling
38fc861a62 Merge "Update summary for Connected devices->Printing." into oc-dev
am: 4bbfdb13e7

Change-Id: Iec490fa3c38a854d3469d238f1d3acb17196a02d
2017-04-06 18:43:14 +00:00
Maurice Lam
0ed1d928d4 Merge "Make GLIF v2 available to OEMs" 2017-04-06 18:42:38 +00:00
Doris Ling
4bbfdb13e7 Merge "Update summary for Connected devices->Printing." into oc-dev 2017-04-06 18:35:53 +00:00
Doris Ling
8071d18ad5 Merge "Update Wifi off summary text." into oc-dev am: 28e35fcf05
am: 0950fa569b

Change-Id: I439f95faddf7848e14d7f94a37e65f5b93394645
2017-04-06 17:20:52 +00:00
Christine Franks
fbf21f4c85 Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5
am: 8606c652d5

Change-Id: Idb0cbf6b0467f9fd43b1e9e40e622146640a9a7e
2017-04-06 17:19:25 +00:00
Doris Ling
0950fa569b Merge "Update Wifi off summary text." into oc-dev
am: 28e35fcf05

Change-Id: I11dbcaa0c5f4509624b174e7daf1aca5506befc2
2017-04-06 17:08:04 +00:00
Christine Franks
8606c652d5 Merge "Prevent apps from displaying over Settings" into oc-dev
am: 24596f51d5

Change-Id: Ie410feec95b77b5c97b19e35a3b3642df1f062db
2017-04-06 17:07:07 +00:00
Doris Ling
28e35fcf05 Merge "Update Wifi off summary text." into oc-dev 2017-04-06 17:04:45 +00:00
Christine Franks
24596f51d5 Merge "Prevent apps from displaying over Settings" into oc-dev 2017-04-06 16:47:53 +00:00
Jesse Evans
0bf40ff77c Fixes instant apps on the Opening links screen
Updates strings to the correct values.

Adds the Instant apps account preference, which launches the
instant apps accounts chooser.

Test: manual test of the settings screen.
Bug: 36514506
Change-Id: I876d0d242bf40a379a3737bc6422e2835fc17839
(cherry picked from commit 1c218c8368)
2017-04-06 16:34:35 +00:00
Marie Janssen
d76cc0a468 Bluetooth: only unregisterReceiver if we register
We can get to onDestroy() without registering now.

Test: none
Fixes: 36501241
Change-Id: I90da3b350f9951993238d51f9fde86ccb335cafd
(cherry picked from commit af34ed06f1)
2017-04-06 08:45:27 -07:00
TreeHugger Robot
ab86bf8244 Merge "Fixes instant apps on the Opening links screen" 2017-04-06 15:33:40 +00:00
Amin Shaikh
ff3d3b45d3 Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev am: 0c4747401a
am: 0a361238d7

Change-Id: I00a3da90f3d5693ea76e1c10d89b1ad792f77b95
2017-04-06 03:09:06 +00:00
Amin Shaikh
920ad23f80 Merge "Update saved networks screen after forget." into oc-dev am: 191d081d57
am: 5951f5ccf6

Change-Id: I28af85fab41a5770dcd5ed48248925d281765b6c
2017-04-06 03:08:49 +00:00
Amin Shaikh
0a361238d7 Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
am: 0c4747401a

Change-Id: Ia60bf563b0719b1abf8c336addba620ec17abe32
2017-04-06 02:03:30 +00:00
Amin Shaikh
5951f5ccf6 Merge "Update saved networks screen after forget." into oc-dev
am: 191d081d57

Change-Id: I439a7dc573bcc37a540d1bf63dedb7392604e371
2017-04-06 02:03:14 +00:00
TreeHugger Robot
0c4747401a Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev 2017-04-06 01:41:43 +00:00
TreeHugger Robot
191d081d57 Merge "Update saved networks screen after forget." into oc-dev 2017-04-06 01:41:28 +00:00
Christine Franks
c50403c606 Prevent apps from displaying over Settings
Specifically, the DrawOverlayDetails fragment only.

Bug: 36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
2017-04-05 17:55:24 -07:00
Marie Janssen
af198e34a8 Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8 am: c27d7effb0 am: f72e86f332
am: 097b20b453

Change-Id: I9e30412565f0318ab2346d44b4c81a149904809f
2017-04-06 00:33:23 +00:00
Marie Janssen
097b20b453 Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8 am: c27d7effb0
am: f72e86f332

Change-Id: Ic0a53a4904b11342fe89bed6d4dea69e595a6cf7
2017-04-06 00:20:16 +00:00
Marie Janssen
f72e86f332 Merge "Bluetooth: only unregisterReceiver if we register" am: 4dc556bda8
am: c27d7effb0

Change-Id: I2c477f40e874ad33a5e3a218370f49e744c68787
2017-04-06 00:17:05 +00:00
Marie Janssen
4dc556bda8 Merge "Bluetooth: only unregisterReceiver if we register" 2017-04-06 00:01:58 +00:00
jackqdyulei
99090544b5 Merge "Fix crash when opening battery page" into oc-dev
am: 418e5bffda

Change-Id: I2ea79ff502abaa99c51e1f5e2d4d359d9845a304
2017-04-05 22:55:48 +00:00
TreeHugger Robot
418e5bffda Merge "Fix crash when opening battery page" into oc-dev 2017-04-05 22:45:46 +00:00
jackqdyulei
a242548be7 Merge "Ui changes in battery main page" into oc-dev
am: f297e843e9

Change-Id: I3b96043a327498f0ed935a80a24d6fffbd36c913
2017-04-05 22:25:48 +00:00
Daniel Nishi
53352cd318 Merge "Lower case the first letter of storage type." into oc-dev
am: 4c52af621a

Change-Id: Ie1aa5e25f13e9d906a3c7c88c8fed60626e88ffe
2017-04-05 22:25:33 +00:00
TreeHugger Robot
f297e843e9 Merge "Ui changes in battery main page" into oc-dev 2017-04-05 22:13:01 +00:00
Daniel Nishi
4c52af621a Merge "Lower case the first letter of storage type." into oc-dev 2017-04-05 22:06:55 +00:00
Maurice Lam
e0e81b68c6 Make GLIF v2 available to OEMs
Rename GLIF Pixel to GLIF v2 and make available to OEMs. In this
model settings read the EXTRA_THEME from the intent and picks between
GLIF and GLIF v2.

Test: Manual
Bug: 36857917
Change-Id: I4899a3d041abaf0b97843cf14affc8d6f9587a22
2017-04-05 21:59:28 +00:00