Filip Pavlis
5a2590dfdb
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: f023f50787
...
am: 7ae53e7df7
2017-04-07 10:45:07 +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
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
TreeHugger Robot
d4bfa472a8
Merge "Import translations. DO NOT MERGE"
2017-04-07 03:56:26 +00:00
Doris Ling
17d103e9d3
Merge "Add summary text for Encryption & credential." into oc-dev am: 65682e7fa5
...
am: 64c8244524
2017-04-07 02:55:03 +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
d49dfb1472
Merge "Add test to verify no crash on selecting brightness level." into oc-dev am: 43146c4972
...
am: 272d65c0bc
2017-04-07 02:37:13 +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
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
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
Marie Janssen
45eb80a8ab
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev am: b26584cf1a
...
am: 6f17c0dada
2017-04-07 00:58:22 +00:00
Andrew Zeng
585c09b7f8
Merge "Use MIN_LOCK_PASSWORD_SIZE as min password length."
2017-04-07 00:52:02 +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
Daniel Nishi
016a8d4768
Merge ""% used" instead of "% full" in storage donut." into oc-dev am: b52a341914
...
am: 11bd2c3084
2017-04-06 23:46:03 +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
262e56c67f
Merge "Move the app_info_storage_title string."
2017-04-06 23:18:12 +00:00
Daniel Nishi
a1edaff22c
Merge "Re-add the option to migrate data back." into oc-dev am: c660755348
...
am: 54cadd92d9
2017-04-06 23:17:15 +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
jackqdyulei
1949de3f14
Merge "Update foreground string in battery page" into oc-dev am: 020bb3bb99
...
am: 672a85aaa5
2017-04-06 23:04:13 +00:00
jackqdyulei
9d78a655fa
Merge "Fix crash when clicking item in Battery screen" into oc-dev am: bac9b527e7
...
am: 23f8052652
2017-04-06 23:03:55 +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
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
23f8052652
Merge "Fix crash when clicking item in Battery screen" into oc-dev
...
am: bac9b527e7
2017-04-06 22:00:23 +00:00
