Commit Graph

35078 Commits

Author SHA1 Message Date
Doris Ling
d49dfb1472 Merge "Add test to verify no crash on selecting brightness level." into oc-dev am: 43146c4972
am: 272d65c0bc

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

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

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

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

Change-Id: I71cebb56677c1cc9f502c1578f2de3fbcfa88f26
2017-04-07 02:21:17 +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
222fe7d8a1 Merge "Add subtext to Default apps." into oc-dev am: 1e775c117a
am: 3da90f7f1c

Change-Id: Id89a509fa97edc1a31223bc25225a75f166e3f9c
2017-04-07 02:03:00 +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
Lei Yu
edeb58d023 Merge "Remove PowerUsageDetail.java" into oc-dev am: bde7097fb9
am: 20dcdfe2cf

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

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
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
Marie Janssen
45eb80a8ab Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev am: b26584cf1a
am: 6f17c0dada

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

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

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

Change-Id: Ie0df09915c2bc3e8c8926e2cec81835a37a7c7b0
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  -s ours

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

Change-Id: I875d8175577011d422c0105f232d26fdbaf04703
2017-04-06 23:04:36 +00:00
jackqdyulei
1949de3f14 Merge "Update foreground string in battery page" into oc-dev am: 020bb3bb99
am: 672a85aaa5

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

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

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

Change-Id: I5ebed1fea938019771aecf964bfe54bcbc6f156b
2017-04-06 22:00:23 +00:00
Bill Yi
06a20f2be9 Merge "Import translations. DO NOT MERGE" into oc-dev am: d67a6d7176 -s ours
am: 3f52ee79d7  -s ours

Change-Id: I02fddb1b1380320d4be87eed730a245d58fe3ba0
2017-04-06 21:54:47 +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  -s ours

Change-Id: I5015d0bc4c6c94aa2f3c777f3a1434ee44527f03
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
Doris Ling
76c325d46c Merge "Add summary text to Display->Brightness level." into oc-dev am: ad69c46712
am: c48ef6dda1

Change-Id: Id4d194f010c07d7d731238600f80dd18589a0358
2017-04-06 20:37:22 +00: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
Daniel Nishi
bf1f8e9ca7 Fake the cache size to be 0 bytes when cleared.
The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.

It will not be zero if the user exits and comes back, but this
should be fine.

MARK IT ZERO!

Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
2017-04-06 13:35:09 -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
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