Doris Ling
0ec7d2eb0d
Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
...
am: f8dead2f40
2017-04-07 20:12:28 +00:00
Doris Ling
f8dead2f40
Merge "Add summary text to Lock screen preferences." into oc-dev
...
am: a258e424a2
2017-04-07 20:07:55 +00:00
TreeHugger Robot
a258e424a2
Merge "Add summary text to Lock screen preferences." into oc-dev
2017-04-07 20:03:36 +00:00
Daniel Nishi
27d8d2b46e
Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
...
am: af587b0cfc
2017-04-07 19:50:05 +00:00
Daniel Nishi
af587b0cfc
Merge "Update the automatic storage management preferences." into oc-dev
...
am: 7badf46542
2017-04-07 19:46:05 +00:00
Daniel Nishi
7badf46542
Merge "Update the automatic storage management preferences." into oc-dev
2017-04-07 19:38:27 +00:00
Daniel Nishi
a480952e3d
Merge "Fake the cache size to be 0 bytes when cleared."
2017-04-07 19:34:58 +00:00
Doris Ling
cee83e4bbf
Add summary text to Lock screen preferences.
...
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.
Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Lei Yu
e0e4c5d3eb
Merge "Remove misc data in battery main page." into oc-dev am: abde170529
...
am: 52e096284f
2017-04-07 18:03:21 +00:00
Lei Yu
52e096284f
Merge "Remove misc data in battery main page." into oc-dev
...
am: abde170529
2017-04-07 17:51:50 +00:00
Lei Yu
abde170529
Merge "Remove misc data in battery main page." into oc-dev
2017-04-07 17:37:18 +00:00
Phil Weaver
19ebace6c4
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev am: 0b9cd1b40e
...
am: ba98033945
2017-04-07 05:55:19 +00:00
Phil Weaver
ba98033945
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
...
am: 0b9cd1b40e
2017-04-07 05:50:42 +00:00
TreeHugger Robot
0b9cd1b40e
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
2017-04-07 05:47:33 +00:00
Jim Miller
fc275db6f6
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev am: b8aaaf82a2
...
am: 9e6345e1b9
2017-04-07 04:55:39 +00:00
Jim Miller
9e6345e1b9
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
...
am: b8aaaf82a2
2017-04-07 04:51:09 +00:00
TreeHugger Robot
b8aaaf82a2
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
2017-04-07 04:47:59 +00:00
Doris Ling
0c39be8889
Merge "Update USb preference controller to use the new summary texts." into oc-dev am: e94ba3b55f
...
am: 8f3be96ba8
2017-04-07 02:36:58 +00:00
Doris Ling
8f3be96ba8
Merge "Update USb preference controller to use the new summary texts." into oc-dev
...
am: e94ba3b55f
2017-04-07 02:33:01 +00:00
TreeHugger Robot
e94ba3b55f
Merge "Update USb preference controller to use the new summary texts." into oc-dev
2017-04-07 02:27:55 +00:00
Doris Ling
388a138fd6
Merge "Update summary text for Trust agent." into oc-dev am: b9a54bae08
...
am: 4e33cc1279
2017-04-07 02:21:17 +00:00
Doris Ling
4e33cc1279
Merge "Update summary text for Trust agent." into oc-dev
...
am: b9a54bae08
2017-04-07 02:17:22 +00:00
TreeHugger Robot
b9a54bae08
Merge "Update summary text for Trust agent." into oc-dev
2017-04-07 02:09:36 +00:00
Doris Ling
222fe7d8a1
Merge "Add subtext to Default apps." into oc-dev am: 1e775c117a
...
am: 3da90f7f1c
2017-04-07 02:03:00 +00:00
Doris Ling
3da90f7f1c
Merge "Add subtext to Default apps." into oc-dev
...
am: 1e775c117a
2017-04-07 01:54:46 +00:00
Lei Yu
edeb58d023
Merge "Remove PowerUsageDetail.java" into oc-dev am: bde7097fb9
...
am: 20dcdfe2cf
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
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
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
2017-04-06 20:37:22 +00: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
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
2017-04-06 19:21:53 +00:00
Doris Ling
38fc861a62
Merge "Update summary for Connected devices->Printing." into oc-dev
...
am: 4bbfdb13e7
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
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
2017-04-06 17:19:25 +00:00
Doris Ling
0950fa569b
Merge "Update Wifi off summary text." into oc-dev
...
am: 28e35fcf05
2017-04-06 17:08:04 +00:00
Christine Franks
8606c652d5
Merge "Prevent apps from displaying over Settings" into oc-dev
...
am: 24596f51d5
2017-04-06 17:07:07 +00:00
