Commit Graph

34388 Commits

Author SHA1 Message Date
Ajay Panicker
bb1174de5e Add default value to Bluetooth AVRCP version property get
When the property isn't set a crash can occur since we try to look up an
empty property value.

Bug: 36531010
Test: Open Developer options after a factory reset
Change-Id: I82c0fde00774ab1a4f3e4c44a715c74d4a7804e9
2017-03-23 01:09:55 +00:00
Sanket Padawe
07328d3983 Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: bd9ce2e4b1 am: f54df6ccfb
am: 5642aa4ae8  -s ours

Change-Id: Ida22695c5e2d9e7db21a71821d6b7efb4ceeb4e3
2017-03-23 01:07:13 +00:00
Sanket Padawe
5642aa4ae8 Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: bd9ce2e4b1
am: f54df6ccfb

Change-Id: I317f715ee814ee1511e67cc57e11ea43af9a2a4c
2017-03-23 00:58:29 +00:00
Sanket Padawe
f54df6ccfb Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am: bd9ce2e4b1

Change-Id: I361f7c1747ab1f16cce149d78cc219f83a16948c
2017-03-23 00:45:56 +00:00
TreeHugger Robot
bd1d698b57 Merge "Add summary text for wallpaper settings." 2017-03-23 00:21:06 +00:00
Fan Zhang
2d4d993ef3 Move "scanning" from location setting actionbar to pref xml
This fixes the breadcrumb for scanning settings when you search "scan".

- Also did some minor cleanup in LocationSettings (creating preference
using the correct context)

Change-Id: I8efc62246f2e18b2bd4b5eb411b40f24e36b0f2a
Fix: 36529569
Test: manual
2017-03-22 17:04:50 -07:00
Doris Ling
9c893bc0a7 Split the plurals strings with zero quantity.
- plurals string with 0 quantity does not work as expect. Remove the
zero quantity string from the plurals string and put it as a separate
string instead.

Bug: 36376411
Test: builds
Change-Id: I5ee532b35969326b03d73edd28e4a213fa90f899
2017-03-22 16:49:17 -07:00
Doris Ling
ee3797005f Update string for Do not disturb preference.
Bug: 34975939
Test: builds
Change-Id: I4567b9133deae1c52741d6f0d48d95be642bf2d2
2017-03-22 16:34:37 -07:00
TreeHugger Robot
f5960f559f Merge "Update summary text for Wi-Fi hotspot" 2017-03-22 23:34:24 +00:00
TreeHugger Robot
7de6dbb2d5 Merge "Add test config to SettingsUnitTests" 2017-03-22 23:16:06 +00:00
Daniel Nishi
fda5d5a6a8 Update the system info dialog.
The string is updated as well as where the dialog shows up.

Change-Id: If1a3b17dca04fe81f52dbdc2353db34ce7adc49a
Fixes: 34857117
Test: Robotest
2017-03-22 16:12:55 -07:00
Fan Zhang
5ae37599b4 Update string character limit
Change-Id: I6e31a7ca637c37d9bd3a99a078b62cba3d5a7b54
Fix: 36400209
Test: manual
2017-03-22 16:11:59 -07:00
Fan Zhang
09c7f15b12 Convert BT preference to use TwoTargetPreference
Change-Id: I0b49af4afb4b782a6057060b2666f6528bc003b2
Fix: 36511169
Test: make RunSettingsRoboTests
2017-03-22 16:03:45 -07:00
Fan Zhang
fe292515d8 Refactor the layout for MasterSwitch to a 2 target pref
And move the layout to settingslib.

The new TwoTargetPreference is a preference object that has a vertical
divider between main panel and widget (if it exists).

Converted master switch, restricted preference, gear preference to use
the new style

Change-Id: Ia3848cebb06b8edc4e60abf9b0caf13cdb29c22c
Fix: 36511169
Test: make RunSettingsRoboTests
2017-03-22 16:03:40 -07:00
Doris Ling
33a247ac16 Add summary text for wallpaper settings.
Bug: 34975969
Test: builds
Change-Id: If6e24aa45590b70aab16effec322cf7100cffb09
2017-03-22 15:04:07 -07:00
Doris Ling
a4a84229f7 Update summary text for Wi-Fi hotspot
Bug: 36296257
Test: builds
Change-Id: Ib8d363ec23528bd2520509f6cefc5f49848cd3d5
2017-03-22 14:56:41 -07:00
Lei Yu
9635123aab Merge "Remove the hardcoded color in main page" 2017-03-22 21:48:02 +00:00
Sanket Padawe
bd9ce2e4b1 Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." 2017-03-22 21:27:22 +00:00
jackqdyulei
71a0574141 Change dialog theme for dialog activity.
Before this cl, all dialog activities use theme
Theme.DeviceDefault.Light.Dialog.NoActionBar. In this cl
we change it to Theme.DeviceDefault.Settings.Dialog.NoActionBar

Bug: 36099867
Bug: 36295409
Test: Screenshot
Change-Id: I2328aad1dce636f2314538d548a49f7a6401eae5
2017-03-22 14:25:15 -07:00
Bookatz
eb602e5504 Update FakeUid with new methods
BatterystatsImpl has new methods for background accounting for Wifi and
Bluetooth scanning. These methods are added to FakeUid.java here.

Bug: 35679958
Bug: 35677312
Bug: 35673525
Test: see ag/2010580
Change-Id: I706f28ba8faaf89e9fde25814e9c583c4731d3de
2017-03-22 14:11:51 -07:00
TreeHugger Robot
cb92917e1e Merge "Use fragment context in AppHeaderController" 2017-03-22 20:59:24 +00:00
TreeHugger Robot
3e4fd030c7 Merge "AVRCP version interop pereference (2/3)" 2017-03-22 20:37:45 +00:00
Charles He
ad828f1551 VPN settings: gray out always-on checkbox dynamically
In the ConfigDialog for legacy VPNs, many configurations do not support
Always-on VPN. Previously, when a user entered an unsupported set of
settings, the Always-on VPN checkbox could still be ticked, and the
Save or Connect action buttons would be disabled. This was not intuitive
as the user could not easily figure out which part of the settings was
incompatible that grayed out the action buttons.

With this change, we disable the Always-on VPN checkbox immediately as
the user enters any incompatible setting. We also display the reason why
Always-on VPN is disabled. This will make it more straightforward for
the users to understand which setting is conflicting with the Always-on
feature.

This change is also the first step towards refactoring the ConfigDialog
for legacy VPNs with PreferenceFragment.

Test: manual
Bug: 29208008
Bug: 28072644
Change-Id: I1e6d32a1069ca0b936513f4985ffb9a9412b249c
2017-03-22 20:29:46 +00:00
Daniel Nishi
34b75da937 Merge "Standardize MasterSwitchPreference attr order." 2017-03-22 20:26:12 +00:00
jackqdyulei
abba040727 Use fragment context in AppHeaderController
The application context doesn't have the correct theme, use
fragment context instead

Fix: 36489386
Fix: 36516826
Test: RunSettingsRoboTests & Screenshot
Change-Id: I8285584220796264d85ea570df5b1df6ebeb275f
2017-03-22 12:42:39 -07:00
Dan Shi
41d96207e8 Add test config to SettingsUnitTests
Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Ie9fdc4717a71cb0f472b004b704acf3c4f770267
2017-03-22 12:07:08 -07:00
Ajay Panicker
e50b0d490a AVRCP version interop pereference (2/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.

Bug: 35956792
Test: Select AVRCP version through developer option
Merged-In: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
Change-Id: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
2017-03-22 18:50:28 +00:00
jackqdyulei
8a05c9b38b Remove the hardcoded color in main page
Since we don't have grey background in settings page, we could
delete selectable_card and use default selectableItemBackground
instead.

Fix: 28129641
Fix: 36508801
Test: Screenshot
Change-Id: I2b61d8f2214df681a0db7f697fcc6a87dc7d78cb
2017-03-22 11:36:02 -07:00
TreeHugger Robot
ceb46ac8e7 Merge "Fix a monkey crash when it dismisses suggestion." 2017-03-22 18:34:56 +00:00
Ajay Panicker
da2723a5ae AVRCP version interop pereference (2/3)
Add a mechanism to allow the user to select the AVRCP version broadcasted
through SDP in the developer options. This helps solve some interoperability
issues such as with Honda Carkits where broadcasting AVRCP version 1.6 causes
media metadata to fail.

Bug: 35956792
Test: Select AVRCP version through developer option
Change-Id: I7d4b1bd23342d1a96ffdf08bb7d6d3c5e5fedca6
2017-03-22 11:32:15 -07:00
Matthew Fritze
fb8e0dc545 Merge "Rename remaining layouts to original search names" 2017-03-22 17:32:19 +00:00
Doris Ling
422fc4a433 Merge "Update preference text for Network & internet screen." 2017-03-22 17:22:27 +00:00
Fan Zhang
8c8c4077fe Fix a monkey crash when it dismisses suggestion.
Change-Id: I300a49ed75381795b6532388f770847ed39a4c8c
Fix: 36509330
Test: make RunSettingsRoboTests
2017-03-22 10:04:39 -07:00
Lei Yu
679ed4c30c Merge "Make percentage add up to dischargeAmount." 2017-03-22 16:49:21 +00:00
Lei Yu
66f978e9d8 Merge "Use the same icon for battery" 2017-03-22 16:48:32 +00:00
Matthew Fritze
28f389e553 Rename remaining layouts to original search names
Change-Id: Ibb0aa087e797c3e7ae93556cf4a00d9746694532
Fixes: 32590887
Test: make RunSettingsGoogleRoboTests
2017-03-22 16:05:24 +00:00
TreeHugger Robot
304d7f4455 Merge "Show channel description." 2017-03-22 14:03:58 +00:00
Doris Ling
47ec3857a5 Update preference text for Network & internet screen.
- Add footer info to Hotspot & tethering
- Add summary text for Data usage -> Network restrictions
- Update summary for Hotspot & tethering -> Portable Wi-Fi hotspot
- Remove quotes from Wi-Fi summary

Bug: 36296257
Test: make RunSettingsRoboTests

Change-Id: Ibab61b089521a3339e660e9df0db0cd1b316712b
2017-03-21 18:00:59 -07:00
Fan Zhang
3a32ee6132 Move autofill app picker from advanced app to language page
Change-Id: I38979e17e51bda92179ca5b7ba4293677aa18a96
Fix: 36130404
Test: make RunSettingsRoboTests
2017-03-21 17:42:27 -07:00
Fan Zhang
3720e0c4f1 Update system setting page subtext
- Move android version from about phone subtext to system update
- Updates strings for autofill, keyboard & input, factory reset, swipe
  for notification
- Add a new pref category for spell checker and personal dictionary
- Display "None" if any default app is not selected
- Display current keyboard type as language subtext

Bug: 36395109
Test: make RunSettingsRoboTests
Change-Id: Id6ca94ea31e55f1c1ec04e47dcf657a25c35c7fe
2017-03-21 17:40:11 -07:00
jackqdyulei
1a4aeead22 Use the same icon for battery
Before this cl, we use different battery icon in the following place:
1. half battery icon in settings page 1
2. full battery icon in settings shortcut(Long press app settings)

This cl refines them to use the same battery icon: full battery icon.

Bug: 36467034
Test: Screenshot
Change-Id: Ibec92ad057a47e6cc7763a4bc6e1e1c16c6288c0
2017-03-21 17:04:08 -07:00
TreeHugger Robot
aaa042de4e Merge "Misc search summary text updates." 2017-03-21 23:47:31 +00:00
TreeHugger Robot
34df520fa6 Merge "Update string char limit" 2017-03-21 23:44:32 +00:00
TreeHugger Robot
ca3997d27e Merge changes I54360698,Ic8a3db21
* changes:
  Finish removing N/A DO disclosures from search index
  DO Disclosures: Combine personal and work CA cert
2017-03-21 23:04:08 +00:00
Sanket Padawe
a71788362c Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Bug: 35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
Merged-in: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f
2017-03-21 22:31:58 +00:00
TreeHugger Robot
19449197e6 Merge "Delete the estimated time in battery usage graph" 2017-03-21 22:24:56 +00:00
jackqdyulei
da8d9fc3d0 Make percentage add up to dischargeAmount.
Refine it in PowerUsageAdvanced.

Bug: 35960502
Test: RunSettingsRoboTests
Change-Id: I46b06409102334e5e9eed4e540a27315a503f8b0
2017-03-21 15:18:44 -07:00
TreeHugger Robot
bbf6d04006 Merge "Create a way to inject a WifiTracker into WifiSettings." 2017-03-21 22:14:43 +00:00
Fan Zhang
fb562e1078 Update string char limit
Test: builds
Change-Id: I77f6a9da33380e24c50255848e35bfe56b757ec7
Fix: 36410839
2017-03-21 15:14:03 -07:00
Sanket Padawe
c0ec917161 Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." 2017-03-21 22:12:56 +00:00