Commit Graph

16602 Commits

Author SHA1 Message Date
Chad Brubaker
68baa35adb Send ACTION_KEYCHAIN_CHANGED when installing a cert
Change-Id: I846162511b5d75d937d4c543d47d535894e1d688
Fixes: 36492950
Test: Verified that installing a cert via UI triggers the broadcast
2017-04-10 10:33:52 -07:00
Daniel Nishi
f4af2774ee Merge "Add user icon to the other user preferences." into oc-dev
am: b1c336de5f

Change-Id: Icce728807ace666984af3a93ef495c448cdb9e7b
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

Change-Id: I5bad76814ac4b6346c634498e0a5952f5d539f17
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

Change-Id: I453db9fc9af0ab8f44535aa39517967e8ec9761c
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

Change-Id: I11366b87d3f3920a79096dad0dd29938da2f8a52
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

Change-Id: Ic9311706e67f28607f17e036eee5bfa8290af82b
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

Change-Id: I6552e8280746f53b05421b767fd92adafecdbf4f
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

Change-Id: Ie4987e836593709c52a7afbedf826501180e1299
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

Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80
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

Change-Id: I19479c26fd00d7e356ff109a089c6605261af870
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

Change-Id: I16a2423d405c34afe1cd589f9007a4b4dafb6925
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

Change-Id: I5e06cdb4513bbc8e2ee23592e5d90f1a9481f994
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

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
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
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
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
38fc861a62 Merge "Update summary for Connected devices->Printing." into oc-dev
am: 4bbfdb13e7

Change-Id: Iec490fa3c38a854d3469d238f1d3acb17196a02d
2017-04-06 18:43:14 +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
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