OSDN Git Service
Daniel Nishi [Wed, 12 Apr 2017 18:57:47 +0000 (18:57 +0000)]
Merge "Don't crash in SecondaryUserController." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 18:37:22 +0000 (18:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow settings preference title to span over multiple lines." into oc-dev
Chad Brubaker [Wed, 12 Apr 2017 17:21:09 +0000 (17:21 +0000)]
Merge "Send ACTION_KEYCHAIN_CHANGED when installing a cert" into oc-dev
Christine Franks [Wed, 12 Apr 2017 17:19:40 +0000 (17:19 +0000)]
Merge "Use correct title when opening from notification" into oc-dev
Daniel Nishi [Tue, 11 Apr 2017 21:30:33 +0000 (14:30 -0700)]
Don't crash in SecondaryUserController.
If icons were fetched before displayPreference() is called, it can
cause a NPE. This adds a null check to ensure that it never
attempts to set an icon without both the icon and preference being
non-null.
Change-Id: Ib4269428e64545c9e255f7e3292fb6c046c1f307
Fixes:
37248158
Test: Settings Robotest
TreeHugger Robot [Wed, 12 Apr 2017 11:20:08 +0000 (11:20 +0000)]
Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev
Niels Egberts [Thu, 30 Mar 2017 10:06:37 +0000 (11:06 +0100)]
Remove unused xml file.
Bug:
36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
(cherry picked from commit
ecb613bd8d485b6c0eed1b7ec10a8dae8d1da08f)
TreeHugger Robot [Wed, 12 Apr 2017 08:20:05 +0000 (08:20 +0000)]
Merge "Remove hotspot receiver from manifest." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Wi-Fi network details page fixes." into oc-dev
Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 02:36:11 +0000 (02:36 +0000)]
Merge "Add placeholder summary to stablize app info pref height" into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:25:36 +0000 (01:25 +0000)]
Merge "Fix nav up button from running process details." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 01:25:21 +0000 (01:25 +0000)]
Merge "Fake the cache size to be 0 bytes when cleared." into oc-dev
TreeHugger Robot [Wed, 12 Apr 2017 00:03:05 +0000 (00:03 +0000)]
Merge "Remove divider above ExpandPreference." into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:43:26 +0000 (23:43 +0000)]
Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:35:37 +0000 (23:35 +0000)]
Merge "Don't show vpn info box when we don't have anything useful" into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 23:35:13 +0000 (23:35 +0000)]
Merge "Revert "Revert "Convert BT preference to use TwoTargetPreference""" into oc-dev
Amin Shaikh [Fri, 7 Apr 2017 21:01:41 +0000 (14:01 -0700)]
Wi-Fi network details page fixes.
- Fix NPE in WifiDetailPreferenceController#setIpText
- Add MAC address preference in the details section
- Set subnet mask and gateway preferences
- Do not show IP information preferences if no information is available
- Fix string capitalization errors
- Only show IPv4 DNS servers under "Network details" section
Bug:
36483230
Bug:
37096448
Bug:
36482499
Bug:
37165860
Test: m RunSettingsRoboTests
Change-Id: I0e3f0ccfc4a8d802b51ed6b3be81c75e384dd06f
TreeHugger Robot [Tue, 11 Apr 2017 22:36:30 +0000 (22:36 +0000)]
Merge "Fixes instant apps on the Opening links screen" into oc-dev
Christine Franks [Tue, 11 Apr 2017 16:56:09 +0000 (09:56 -0700)]
Use correct title when opening from notification
Bug:
36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.
Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac
Fan Zhang [Tue, 11 Apr 2017 20:40:10 +0000 (13:40 -0700)]
Fix nav up button from running process details.
Change-Id: I08fbbc1dab886dd26e7d780c0fc1b50c98a0e2f8
Fix:
36667083
Test: manual
Doris Ling [Tue, 11 Apr 2017 20:17:38 +0000 (13:17 -0700)]
Allow settings preference title to span over multiple lines.
- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.
Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix:
34886787
Test: manual
Andrew Sapperstein [Tue, 11 Apr 2017 01:30:21 +0000 (18:30 -0700)]
Remove divider above ExpandPreference.
Change-Id: Ib1841d99025af3f97495efd6d6186b328af33f84
Fixes:
36479214
Test: manual, visual update
Julia Reynolds [Tue, 11 Apr 2017 19:18:52 +0000 (19:18 +0000)]
Merge "Sort channels and groups by id" into oc-dev
Doris Ling [Thu, 30 Mar 2017 21:40:25 +0000 (14:40 -0700)]
Remove hotspot receiver from manifest.
The hotspot receiver if used to cancel any tethering alarm set when wifi
ap state changes. Removing it from the manifest, and only register the
receiver when we schedule the tethering alarm.
Change-Id: I97c3be6e2a374949208bbdd4ac5ccc2fabf0291a
Fix:
35968322
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 11 Apr 2017 18:28:11 +0000 (11:28 -0700)]
Don't show vpn info box when we don't have anything useful
Change-Id: I12a71b38486cab8a6a188c299e90a7674926dc98
Fix:
36068109
Test: make RunSettingsRoboTests -j40
Charles He [Tue, 11 Apr 2017 18:37:05 +0000 (19:37 +0100)]
VPN settings: better a11y voice for legacy dialog
Previously, the user input fields in the legacy VPN config dialog would
simply be read out as "edit box", "drop-down list", etc., without
reference to their corresponding labels. This is not optimal for
low-vision users.
In this CL, we add a "labelFor" attribute to the prompt TextView of each
field. The resulting input fields would instead be read out as "edit box
for username", "drop-down list for type", etc., which are much less
ambiguous than before.
Bug:
37202471
Test: make SettingsGoogle and navigate the dialog with TalkBack on
Change-Id: Id23d0563984e3de4a4a3d03a587ca130b50508fc
Daniel Nishi [Tue, 28 Mar 2017 17:44:37 +0000 (10:44 -0700)]
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
(cherry picked from commit
bf1f8e9ca74736ea2d795ce918e45c972dfea52c)
Hyunyoung Song [Tue, 11 Apr 2017 18:11:48 +0000 (18:11 +0000)]
Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
Tony Mantler [Mon, 10 Apr 2017 22:20:59 +0000 (15:20 -0700)]
Fix sketchy usage of new PreferenceScreen
Things get weird if you don't use PreferenceManager#createPreferenceScreen
Bug:
37216851
Test: Compiles and runs
Change-Id: I7cebec133c4f27f7eeda83c95d8acb4823f67dc4
Lei Yu [Tue, 11 Apr 2017 17:10:07 +0000 (17:10 +0000)]
Merge "Add textAlignment for preference_widget_summary" into oc-dev
Fan Zhang [Mon, 10 Apr 2017 23:26:42 +0000 (16:26 -0700)]
Revert "Revert "Convert BT preference to use TwoTargetPreference""
This reverts commit
457c3cbec2cf38a671a101e9c9426b318aff1564.
Revert with fix/test.
The fix is that we removed DevicePickerFragment#initDevicePreference(),
which incorrectly set a useless widget on preference, and removes the
gear icon from preference, preventing bind() call to go through
Change-Id: Ia70cdb51d13cca6035a4e7fe8008d195f7f00c6e
Fix:
36511169
Test: runtest --path tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
Fan Zhang [Mon, 10 Apr 2017 22:42:00 +0000 (15:42 -0700)]
Update string char limits
Fix:
36852178
Fix:
36851715
Fix:
36657781
Fix:
36700992
Fix:
36650008
Fix:
36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201
TreeHugger Robot [Tue, 11 Apr 2017 15:44:29 +0000 (15:44 +0000)]
Merge "Add "Current screen saver" string" into oc-dev
Doris Ling [Tue, 11 Apr 2017 15:24:43 +0000 (15:24 +0000)]
Merge "Update text for security preference." into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 07:22:51 +0000 (07:22 +0000)]
Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev
Bill Yi [Tue, 11 Apr 2017 02:55:40 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib38bbcc49ccc93de1730d806ed369cce9b7ecb40
Auto-generated-cl: translation import
jackqdyulei [Fri, 7 Apr 2017 19:09:40 +0000 (12:09 -0700)]
Add textAlignment for preference_widget_summary
To make sure the text are aligned to the "viewEnd".
Bug:
37159537
Test: Screenshot
Change-Id: Ifab03dda6c9954d6b83ce4db0708303e0c5d32bd
TreeHugger Robot [Tue, 11 Apr 2017 01:24:08 +0000 (01:24 +0000)]
Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 10 Apr 2017 23:54:54 +0000 (23:54 +0000)]
Merge "Reindex on OTA and locale change" into oc-dev
Sean Stout [Mon, 10 Apr 2017 22:31:25 +0000 (15:31 -0700)]
Remove Night Light suggestion. DO NOT MERGE
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug:
37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
Fan Zhang [Mon, 10 Apr 2017 23:17:33 +0000 (16:17 -0700)]
Add placeholder summary to stablize app info pref height
Change-Id: I6a62a94bb02271cdde9873745432aa829d6d4460
Fix:
36900036
Test: rebuild and existing robotests
Doris Ling [Mon, 10 Apr 2017 22:21:18 +0000 (15:21 -0700)]
Update text for security preference.
Swap location to screen lock in title and summary.
Bug:
37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
Hyunyoung Song [Thu, 6 Apr 2017 18:04:53 +0000 (11:04 -0700)]
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
Matthew Fritze [Mon, 3 Apr 2017 18:35:48 +0000 (11:35 -0700)]
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
Evan Laird [Mon, 10 Apr 2017 20:31:06 +0000 (16:31 -0400)]
Add "Current screen saver" string
This one was missed originally.
Test: none
Bug:
35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
Garfield Tan [Mon, 10 Apr 2017 20:24:19 +0000 (20:24 +0000)]
Merge "Fix the intent to launch storage details." into oc-dev
Chad Brubaker [Mon, 10 Apr 2017 17:26:46 +0000 (10:26 -0700)]
Send ACTION_KEYCHAIN_CHANGED when installing a cert
Change-Id: I846162511b5d75d937d4c543d47d535894e1d688
Fixes:
36492950
Test: Verified that installing a cert via UI triggers the broadcast
Daniel Nishi [Mon, 10 Apr 2017 17:27:24 +0000 (17:27 +0000)]
Merge "Add user icon to the other user preferences." into oc-dev
Lei Yu [Mon, 10 Apr 2017 17:06:44 +0000 (17:06 +0000)]
Merge "Add log for BatteryUtils" into oc-dev
Julia Reynolds [Mon, 10 Apr 2017 16:47:13 +0000 (12:47 -0400)]
Sort channels and groups by id
Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
TreeHugger Robot [Sat, 8 Apr 2017 08:06:36 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Garfield Tan [Sat, 8 Apr 2017 01:42:32 +0000 (18:42 -0700)]
Fix the intent to launch storage details.
Test: Manual tests & robo tests.
Bug:
37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
Daniel Nishi [Fri, 24 Mar 2017 19:23:27 +0000 (12:23 -0700)]
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
Lei Yu [Fri, 7 Apr 2017 21:03:15 +0000 (21:03 +0000)]
Merge "Extend the translation limit to 60" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 20:03:35 +0000 (20:03 +0000)]
Merge "Add summary text to Lock screen preferences." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 19:55:53 +0000 (19:55 +0000)]
Merge "Increase char limit for adaptive brightness text." into oc-dev
Daniel Nishi [Fri, 7 Apr 2017 19:38:26 +0000 (19:38 +0000)]
Merge "Update the automatic storage management preferences." into oc-dev
Kevin Chyn [Thu, 6 Apr 2017 18:11:57 +0000 (11:11 -0700)]
renaming/removing fingerprints should be reflected in UI immediately
Fixes
30252265
Test: manual
Change-Id: I5b1bcfff6a6a9ae407db6084562d0244cc5c45c2
jackqdyulei [Wed, 5 Apr 2017 22:21:36 +0000 (15:21 -0700)]
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
Doris Ling [Thu, 6 Apr 2017 23:01:37 +0000 (16:01 -0700)]
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
Lei Yu [Fri, 7 Apr 2017 17:37:17 +0000 (17:37 +0000)]
Merge "Remove misc data in battery main page." into oc-dev
jackqdyulei [Fri, 7 Apr 2017 17:29:58 +0000 (10:29 -0700)]
Extend the translation limit to 60
Bug:
36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
Paul Stewart [Thu, 26 Jan 2017 04:54:27 +0000 (20:54 -0800)]
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
Andrew Sapperstein [Thu, 6 Apr 2017 19:46:00 +0000 (12:46 -0700)]
Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes:
37014409
Test: string change
Bill Yi [Fri, 7 Apr 2017 16:27:04 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibe3f320c6df848eea67091636daf2edeab020c51
Auto-generated-cl: translation import
Filip Pavlis [Fri, 7 Apr 2017 10:31:39 +0000 (10:31 +0000)]
Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 05:47:32 +0000 (05:47 +0000)]
Merge "Don't enable a11y service if scary dialog obscured" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 04:47:59 +0000 (04:47 +0000)]
Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:40:12 +0000 (02:40 +0000)]
Merge "Add summary text for Encryption & credential." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:28:46 +0000 (02:28 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:27:54 +0000 (02:27 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:09:35 +0000 (02:09 +0000)]
Merge "Update summary text for Trust agent." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 01:41:50 +0000 (01:41 +0000)]
Merge "Add subtext to Default apps." into oc-dev
Lei Yu [Fri, 7 Apr 2017 01:34:36 +0000 (01:34 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev
Jim Miller [Fri, 7 Apr 2017 01:08:10 +0000 (18:08 -0700)]
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
Suprabh Shukla [Fri, 7 Apr 2017 00:52:57 +0000 (17:52 -0700)]
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
TreeHugger Robot [Fri, 7 Apr 2017 00:42:04 +0000 (00:42 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
Doris Ling [Thu, 6 Apr 2017 21:22:18 +0000 (14:22 -0700)]
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
Doris Ling [Wed, 5 Apr 2017 23:03:02 +0000 (16:03 -0700)]
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
Doris Ling [Thu, 6 Apr 2017 23:31:02 +0000 (16:31 -0700)]
Add summary text for Encryption & credential.
Add the static summary to the preference in the xml.
Bug:
36540633
Test: visual
Change-Id: Ie1bb01a42acf969e26c3c9b036d2db68d1817e97
Daniel Nishi [Thu, 6 Apr 2017 23:19:17 +0000 (23:19 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 22:49:23 +0000 (22:49 +0000)]
Merge "Re-add the option to migrate data back." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 22:25:55 +0000 (22:25 +0000)]
Merge "Update foreground string in battery page" into oc-dev
Doris Ling [Thu, 6 Apr 2017 22:10:29 +0000 (15:10 -0700)]
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
jackqdyulei [Tue, 4 Apr 2017 20:04:36 +0000 (13:04 -0700)]
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
TreeHugger Robot [Thu, 6 Apr 2017 21:50:06 +0000 (21:50 +0000)]
Merge "Fix crash when clicking item in Battery screen" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Daniel Nishi [Thu, 2 Mar 2017 23:58:23 +0000 (15:58 -0800)]
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
Doris Ling [Thu, 6 Apr 2017 20:03:23 +0000 (20:03 +0000)]
Merge "Add summary text to Display->Brightness level." into oc-dev
jackqdyulei [Thu, 6 Apr 2017 19:48:52 +0000 (12:48 -0700)]
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
Bill Yi [Thu, 6 Apr 2017 19:36:34 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36981734
Change-Id: I2d0ef02f962fd737c6269feb97dc9ca9336671a5
Doris Ling [Thu, 6 Apr 2017 18:35:52 +0000 (18:35 +0000)]
Merge "Update summary for Connected devices->Printing." into oc-dev
Doris Ling [Thu, 6 Apr 2017 17:04:44 +0000 (17:04 +0000)]
Merge "Update Wifi off summary text." into oc-dev
Doris Ling [Thu, 6 Apr 2017 17:01:45 +0000 (17:01 +0000)]
Merge "Re-order the display settings items." into oc-dev
Christine Franks [Thu, 6 Apr 2017 16:47:52 +0000 (16:47 +0000)]
Merge "Prevent apps from displaying over Settings" into oc-dev
Jesse Evans [Fri, 31 Mar 2017 23:11:53 +0000 (16:11 -0700)]
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
1c218c8368aa799ec85f7e75a1e14abde021db2a)
Marie Janssen [Thu, 23 Mar 2017 21:36:45 +0000 (14:36 -0700)]
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
af34ed06f1b4b3734d883c7398b713b20585e1bd)