Commit Graph

34564 Commits

Author SHA1 Message Date
Lei Yu
abde170529 Merge "Remove misc data in battery main page." into oc-dev 2017-04-07 17:37:18 +00:00
jackqdyulei
145cb81c21 Extend the translation limit to 60
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07: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
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
Bill Yi
2de5bb8291 Import translations. DO NOT MERGE
Change-Id: Ibe3f320c6df848eea67091636daf2edeab020c51
Auto-generated-cl: translation import
2017-04-07 09:27:04 -07:00
Filip Pavlis
f023f50787 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev 2017-04-07 10:31:45 +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
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
65682e7fa5 Merge "Add summary text for Encryption & credential." into oc-dev 2017-04-07 02:40:13 +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
TreeHugger Robot
b9a54bae08 Merge "Update summary text for Trust agent." into oc-dev 2017-04-07 02:09:36 +00:00
TreeHugger Robot
1e775c117a Merge "Add subtext to Default apps." into oc-dev 2017-04-07 01:41:51 +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
Suprabh Shukla
aa9fe03dfa Renaming intent action for unknown sources
Renaming action MANAGE_EXTERNAL_SOURCES to MANAGE_UNKNOWN_APP_SOURCES to
be clearer about its purpose

Test: adb shell am instrument -w -e class \
com.android.settings.applications.ExternalSourcesSettingsTest \
com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner

cts-tradefed run singleCommand cts -m ExternalSources

Bug: 35812498
Change-Id: Ic6db5b3446c1890a358f5b5225d38409d1bd2c7c
2017-04-06 18:05:32 -07: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
b52a341914 Merge ""% used" instead of "% full" in storage donut." into oc-dev 2017-04-06 23:19:18 +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
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
TreeHugger Robot
bac9b527e7 Merge "Fix crash when clicking item in Battery screen" into oc-dev 2017-04-06 21:50:07 +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
Doris Ling
ad69c46712 Merge "Add summary text to Display->Brightness level." into oc-dev 2017-04-06 20:03:24 +00:00
jackqdyulei
fefdd5d47f Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.

This cl set these two items as non-selectable.

Bug: 37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
2017-04-06 12:52:50 -07:00
Bill Yi
e224be20a1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36981734
Change-Id: I2d0ef02f962fd737c6269feb97dc9ca9336671a5
2017-04-06 12:36:34 -07:00
Doris Ling
4bbfdb13e7 Merge "Update summary for Connected devices->Printing." into oc-dev 2017-04-06 18:35:53 +00:00
Doris Ling
28e35fcf05 Merge "Update Wifi off summary text." into oc-dev 2017-04-06 17:04:45 +00:00
Doris Ling
5a03e321bc Merge "Re-order the display settings items." into oc-dev 2017-04-06 17:01:46 +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
Marie Janssen
d76cc0a468 Bluetooth: only unregisterReceiver if we register
We can get to onDestroy() without registering now.

Test: none
Fixes: 36501241
Change-Id: I90da3b350f9951993238d51f9fde86ccb335cafd
(cherry picked from commit af34ed06f1)
2017-04-06 08:45:27 -07:00
TreeHugger Robot
0c4747401a Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev 2017-04-06 01:41:43 +00:00
TreeHugger Robot
191d081d57 Merge "Update saved networks screen after forget." into oc-dev 2017-04-06 01:41:28 +00:00
TreeHugger Robot
8c215807b2 Merge "Add resource string for Security dashboard summary." into oc-dev 2017-04-06 01:25:06 +00:00
Christine Franks
c50403c606 Prevent apps from displaying over Settings
Specifically, the DrawOverlayDetails fragment only.

Bug: 36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
2017-04-05 17:55:24 -07:00
TreeHugger Robot
418e5bffda Merge "Fix crash when opening battery page" into oc-dev 2017-04-05 22:45:46 +00:00
TreeHugger Robot
f297e843e9 Merge "Ui changes in battery main page" into oc-dev 2017-04-05 22:13:01 +00:00
Daniel Nishi
4c52af621a Merge "Lower case the first letter of storage type." into oc-dev 2017-04-05 22:06:55 +00:00
TreeHugger Robot
8b06cbd3a9 Merge "Create Espresso test class for WifiSettings." into oc-dev 2017-04-05 21:27:40 +00:00
TreeHugger Robot
248c04001e Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev 2017-04-05 21:20:10 +00:00
jackqdyulei
ae01ef5906 Remove PowerUsageDetail.java
Now we use AdvancedPowerUsageDetail instead.

This cl also:
1. Remove PowerUsageDetail in SearchIndexableResources since we
don't want to index PowerUsageDetail
2. Add AdvancedPowerUsageDetail in SettingsGateway

Bug: 36992358
Test: Build
Change-Id: I598bb159aa2b5a4889071ae9a17d29554e6afe11
2017-04-05 14:20:06 -07:00
jackqdyulei
cdbc114376 Fix crash when opening battery page
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.

Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/36816681

Bug: 36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
(cherry picked from commit fac713318c)
2017-04-05 14:12:26 -07:00
TreeHugger Robot
0647c97a8e Merge "Removed deprecated auto(F)ill settings." into oc-dev 2017-04-05 20:25:41 +00:00
Daniel Nishi
7ad05fb1f3 Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev 2017-04-05 20:10:59 +00:00