Kevin Chyn
e359c21f71
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
...
am: 78dce02079
2017-04-07 21:01:09 +00:00
TreeHugger Robot
78dce02079
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
2017-04-07 20:55:15 +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
Andrew Sapperstein
e6db78a2f1
Merge "Increase char limit for adaptive brightness text." into oc-dev
...
am: a9acbd924a
2017-04-07 20:02:37 +00:00
TreeHugger Robot
a9acbd924a
Merge "Increase char limit for adaptive brightness text." into oc-dev
2017-04-07 19:55:54 +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
Kevin Chyn
474178d094
renaming/removing fingerprints should be reflected in UI immediately
...
Fixes 30252265
Test: manual
Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2
2017-04-07 11:52:00 -07: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
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
Andrew Sapperstein
12bdb22400
Increase char limit for adaptive brightness text.
...
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change
2017-04-07 17:23:30 +00:00
Filip Pavlis
7ae53e7df7
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
...
am: f023f50787
2017-04-07 10:38:54 +00:00
Filip Pavlis
f023f50787
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
2017-04-07 10:31:45 +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
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
64c8244524
Merge "Add summary text for Encryption & credential." into oc-dev
...
am: 65682e7fa5
2017-04-07 02:47:53 +00:00
TreeHugger Robot
65682e7fa5
Merge "Add summary text for Encryption & credential." into oc-dev
2017-04-07 02:40:13 +00:00
Doris Ling
272d65c0bc
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
...
am: 43146c4972
2017-04-07 02:33:17 +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
43146c4972
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
2017-04-07 02:28:47 +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
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
3da90f7f1c
Merge "Add subtext to Default apps." into oc-dev
...
am: 1e775c117a
2017-04-07 01:54:46 +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
Marie Janssen
6f17c0dada
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
...
am: b26584cf1a
2017-04-07 00:50:54 +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
Doris Ling
415ce9a77d
Add summary text for Encryption & credential.
...
Add the static summary to the preference in the xml.
Bug: 36540633
Test: visual
Change-Id: Ie1bb01a42acf969e26c3c9b036d2db68d1817e97
2017-04-06 16:31:02 -07:00
Daniel Nishi
11bd2c3084
Merge ""% used" instead of "% full" in storage donut." into oc-dev
...
am: b52a341914
2017-04-06 23:25:10 +00:00
Daniel Nishi
b52a341914
Merge ""% used" instead of "% full" in storage donut." into oc-dev
2017-04-06 23:19:18 +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
jackqdyulei
672a85aaa5
Merge "Update foreground string in battery page" into oc-dev
...
am: 020bb3bb99
2017-04-06 22:35:29 +00:00
TreeHugger Robot
020bb3bb99
Merge "Update foreground string in battery page" into oc-dev
2017-04-06 22:25:55 +00:00
Doris Ling
de03809396
Add test to verify no crash on selecting brightness level.
...
Add UI test to launch Settings->Display->Brightness level and Settings
app does not crash.
Change-Id: I526f44961bd0efbcacde334affbe2b7a93da0ce3
Fix: 36647069
Test: make SettingsTests
2017-04-06 15:10:29 -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
jackqdyulei
23f8052652
Merge "Fix crash when clicking item in Battery screen" into oc-dev
...
am: bac9b527e7
2017-04-06 22:00:23 +00:00
TreeHugger Robot
bac9b527e7
Merge "Fix crash when clicking item in Battery screen" into oc-dev
2017-04-06 21:50:07 +00:00
Bill Yi
3f52ee79d7
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: d67a6d7176
2017-04-06 21:49:40 +00:00
TreeHugger Robot
d67a6d7176
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-06 21:44:11 +00: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
