Julia Reynolds
80f06dc54c
Merge "Sort channels and groups by id" into oc-dev
...
am: 665c1ced58
2017-04-11 19:43:06 +00:00
Hyunyoung Song
71ba393033
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
...
am: 9234a34a80
2017-04-11 19:42:47 +00:00
Julia Reynolds
665c1ced58
Merge "Sort channels and groups by id" into oc-dev
2017-04-11 19:18:53 +00:00
Hyunyoung Song
9234a34a80
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
2017-04-11 18:11:49 +00:00
Paul Stewart
14633029d2
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
...
am: 6d7f210c0b
2017-04-11 07:47:36 +00:00
TreeHugger Robot
6d7f210c0b
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
2017-04-11 07:22:52 +00:00
Matthew Fritze
5bb64aeb59
Merge "Reindex on OTA and locale change" into oc-dev
...
am: f84c8d3480
2017-04-11 00:19:36 +00:00
TreeHugger Robot
f84c8d3480
Merge "Reindex on OTA and locale change" into oc-dev
2017-04-10 23:54:55 +00:00
Honglu Yin
381570cda2
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51
...
am: b9b563d243
2017-04-10 23:23:44 +00:00
Honglu Yin
b9b563d243
Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a
...
am: 4604741c51
2017-04-10 23:22:49 +00:00
Jack He
075ee6109f
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
...
am: 336a7ccca7
2017-04-10 23:20:34 +00:00
Jack He
336a7ccca7
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
...
am: 9e1e430f06
2017-04-10 23:11:42 +00:00
Treehugger Robot
7d9146e10a
Merge "Title is different after tapping "Memory used by apps""
2017-04-10 22:53:09 +00:00
Jack He
3d08bedba2
Merge "Add developer menu entry to enable Bluetooth inband ringing"
2017-04-10 22:47:55 +00:00
Hyunyoung Song
ebc17237c3
Add shadow to AdaptiveIconDrawables using View level shadow
...
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:
Bug: 36088922
Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Matthew Fritze
a0d03178d0
Reindex on OTA and locale change
...
When the user gets an OTA or changes language, settings
will clear the database and reindex it.
Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
2017-04-10 14:28:39 -07:00
Garfield Tan
cea8a43a92
Merge "Fix the intent to launch storage details." into oc-dev
...
am: 66871d8531
2017-04-10 20:41:47 +00:00
Garfield Tan
66871d8531
Merge "Fix the intent to launch storage details." into oc-dev
2017-04-10 20:24:20 +00:00
Daniel Nishi
f4af2774ee
Merge "Add user icon to the other user preferences." into oc-dev
...
am: b1c336de5f
2017-04-10 17:32:27 +00:00
Daniel Nishi
b1c336de5f
Merge "Add user icon to the other user preferences." into oc-dev
2017-04-10 17:27:25 +00:00
Lei Yu
964de0d7be
Merge "Add log for BatteryUtils" into oc-dev
...
am: 27dc9b69ac
2017-04-10 17:13:22 +00:00
Lei Yu
27dc9b69ac
Merge "Add log for BatteryUtils" into oc-dev
2017-04-10 17:06:45 +00:00
Julia Reynolds
7be0dbd86c
Sort channels and groups by id
...
Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
2017-04-10 12:47:13 -04:00
Garfield Tan
973cddcb1b
Fix the intent to launch storage details.
...
Test: Manual tests & robo tests.
Bug: 37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
2017-04-07 19:08:29 -07:00
Daniel Nishi
fe33c58a18
Add user icon to the other user preferences.
...
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.
Fixes: 36252572
Test: Robotest
Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
2017-04-07 14:57:07 -07:00
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
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
jackqdyulei
5d2918a675
Add log for BatteryUtils
...
This cl add logs to get more data for app usage time.
Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.
Bug: 36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f
2017-04-07 11:18:39 -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
Paul Stewart
9b26496d03
Allow user to specify EAP-SIM under PEAP
...
Allow the user to select EAP-SIM methods as a second phase after
an outer PEAP authentication. This hides the "identity" and
"password" fields if one of these methods is selected.
Bug: 34835771
Test: Manual: Connect to PEAP/EAP-SIM AP
Change-Id: I7e448fbebd352a4b0facbfafa74afaff6b704386
2017-04-07 10:28:49 -07: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
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
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
