OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoUpdate summary text for Wi-Fi hotspot
Doris Ling [Wed, 22 Mar 2017 21:56:41 +0000 (14:56 -0700)]
Update summary text for Wi-Fi hotspot

Bug: 36296257
Test: builds
Change-Id: Ib8d363ec23528bd2520509f6cefc5f49848cd3d5

7 years agoMerge "Use fragment context in AppHeaderController"
TreeHugger Robot [Wed, 22 Mar 2017 20:59:23 +0000 (20:59 +0000)]
Merge "Use fragment context in AppHeaderController"

7 years agoMerge "AVRCP version interop pereference (2/3)"
TreeHugger Robot [Wed, 22 Mar 2017 20:37:44 +0000 (20:37 +0000)]
Merge "AVRCP version interop pereference (2/3)"

7 years agoMerge "Standardize MasterSwitchPreference attr order."
Daniel Nishi [Wed, 22 Mar 2017 20:26:12 +0000 (20:26 +0000)]
Merge "Standardize MasterSwitchPreference attr order."

7 years agoUse fragment context in AppHeaderController
jackqdyulei [Wed, 22 Mar 2017 01:30:21 +0000 (18:30 -0700)]
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

7 years agoMerge "Fix a monkey crash when it dismisses suggestion."
TreeHugger Robot [Wed, 22 Mar 2017 18:34:55 +0000 (18:34 +0000)]
Merge "Fix a monkey crash when it dismisses suggestion."

7 years agoAVRCP version interop pereference (2/3)
Ajay Panicker [Mon, 20 Mar 2017 18:34:54 +0000 (11:34 -0700)]
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

7 years agoMerge "Rename remaining layouts to original search names"
Matthew Fritze [Wed, 22 Mar 2017 17:32:18 +0000 (17:32 +0000)]
Merge "Rename remaining layouts to original search names"

7 years agoMerge "Update preference text for Network & internet screen."
Doris Ling [Wed, 22 Mar 2017 17:22:27 +0000 (17:22 +0000)]
Merge "Update preference text for Network & internet screen."

7 years agoFix a monkey crash when it dismisses suggestion.
Fan Zhang [Wed, 22 Mar 2017 16:40:06 +0000 (09:40 -0700)]
Fix a monkey crash when it dismisses suggestion.

Change-Id: I300a49ed75381795b6532388f770847ed39a4c8c
Fix: 36509330
Test: make RunSettingsRoboTests

7 years agoMerge "Make percentage add up to dischargeAmount."
Lei Yu [Wed, 22 Mar 2017 16:49:20 +0000 (16:49 +0000)]
Merge "Make percentage add up to dischargeAmount."

7 years agoMerge "Use the same icon for battery"
Lei Yu [Wed, 22 Mar 2017 16:48:31 +0000 (16:48 +0000)]
Merge "Use the same icon for battery"

7 years agoRename remaining layouts to original search names
Matthew Fritze [Wed, 22 Mar 2017 16:02:01 +0000 (09:02 -0700)]
Rename remaining layouts to original search names

Change-Id: Ibb0aa087e797c3e7ae93556cf4a00d9746694532
Fixes: 32590887
Test: make RunSettingsGoogleRoboTests

7 years agoMerge "Show channel description."
TreeHugger Robot [Wed, 22 Mar 2017 14:03:56 +0000 (14:03 +0000)]
Merge "Show channel description."

7 years agoUpdate preference text for Network & internet screen.
Doris Ling [Tue, 21 Mar 2017 21:40:43 +0000 (14:40 -0700)]
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

7 years agoMove autofill app picker from advanced app to language page
Fan Zhang [Wed, 22 Mar 2017 00:26:59 +0000 (17:26 -0700)]
Move autofill app picker from advanced app to language page

Change-Id: I38979e17e51bda92179ca5b7ba4293677aa18a96
Fix: 36130404
Test: make RunSettingsRoboTests

7 years agoUpdate system setting page subtext
Fan Zhang [Tue, 21 Mar 2017 22:15:27 +0000 (15:15 -0700)]
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

7 years agoUse the same icon for battery
jackqdyulei [Tue, 21 Mar 2017 23:56:41 +0000 (16:56 -0700)]
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

7 years agoMerge "Misc search summary text updates."
TreeHugger Robot [Tue, 21 Mar 2017 23:47:30 +0000 (23:47 +0000)]
Merge "Misc search summary text updates."

7 years agoMerge "Update string char limit"
TreeHugger Robot [Tue, 21 Mar 2017 23:44:31 +0000 (23:44 +0000)]
Merge "Update string char limit"

7 years agoMerge changes I54360698,Ic8a3db21
TreeHugger Robot [Tue, 21 Mar 2017 23:04:07 +0000 (23:04 +0000)]
Merge changes I54360698,Ic8a3db21

* changes:
  Finish removing N/A DO disclosures from search index
  DO Disclosures: Combine personal and work CA cert

7 years agoMerge "Delete the estimated time in battery usage graph"
TreeHugger Robot [Tue, 21 Mar 2017 22:24:55 +0000 (22:24 +0000)]
Merge "Delete the estimated time in battery usage graph"

7 years agoMake percentage add up to dischargeAmount.
jackqdyulei [Tue, 21 Mar 2017 22:18:44 +0000 (15:18 -0700)]
Make percentage add up to dischargeAmount.

Refine it in PowerUsageAdvanced.

Bug: 35960502
Test: RunSettingsRoboTests
Change-Id: I46b06409102334e5e9eed4e540a27315a503f8b0

7 years agoMerge "Create a way to inject a WifiTracker into WifiSettings."
TreeHugger Robot [Tue, 21 Mar 2017 22:14:42 +0000 (22:14 +0000)]
Merge "Create a way to inject a WifiTracker into WifiSettings."

7 years agoUpdate string char limit
Fan Zhang [Tue, 21 Mar 2017 22:12:37 +0000 (15:12 -0700)]
Update string char limit

Test: builds
Change-Id: I77f6a9da33380e24c50255848e35bfe56b757ec7
Fix: 36410839

7 years agoMerge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
Sanket Padawe [Tue, 21 Mar 2017 22:12:55 +0000 (22:12 +0000)]
Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."

7 years agoMerge "Update activity alias for developer settings activity"
TreeHugger Robot [Tue, 21 Mar 2017 22:03:34 +0000 (22:03 +0000)]
Merge "Update activity alias for developer settings activity"

7 years agoMerge "Fix some animation janks during code start."
TreeHugger Robot [Tue, 21 Mar 2017 21:57:01 +0000 (21:57 +0000)]
Merge "Fix some animation janks during code start."

7 years agoMisc search summary text updates.
Fan Zhang [Tue, 21 Mar 2017 21:13:18 +0000 (14:13 -0700)]
Misc search summary text updates.

- Remove static text from default app summaries.They will be filled
dynamically at runtime, so we don't need the static ones here.
- Remove summaryOn/summaryOff strings from a few fragments. Search
framework does not need them.

Change-Id: I165766073ba70aceead88c3df02d62f3700e4592
Fix: 36474747
Fix: 34573952
Test: run existing tests

7 years agoStandardize MasterSwitchPreference attr order.
Daniel Nishi [Tue, 21 Mar 2017 20:51:00 +0000 (13:51 -0700)]
Standardize MasterSwitchPreference attr order.

Test: Manual
Change-Id: Ib1072af6246696ed9f67922b2114a83ddea7015e

7 years agoDelete the estimated time in battery usage graph
jackqdyulei [Thu, 16 Mar 2017 02:27:31 +0000 (19:27 -0700)]
Delete the estimated time in battery usage graph

Bug: 31012673
Test: RunSettingsRoboTests
Change-Id: Icac85a5fc523b70904e048d17eace30c91fe54ee

7 years agoFix some animation janks during code start.
Fan Zhang [Tue, 21 Mar 2017 00:32:32 +0000 (17:32 -0700)]
Fix some animation janks during code start.

- Create a   summary placeholder for preferences with summary.
- Create a totally empty summary for prefernces without summary.
- For all dynamic prefs that has *no* SummaryLoader, add meta to set
their summary to empty.
- Other dynamic perfs has   as initial summary.

By doing this, all dynamic pref's height is fixed and will not change as
we update summaries, thus eliminating jank during cold start in each
page.

Also removed DashboardAlias for notification preference and default apps as a side fix.

Change-Id: Iec98b7ffef4e920bf573b2244ad04124c1c5d154
Fix: 36414481
Test: make RunSettingsRoboTests

7 years agoMerge "Update strings"
TreeHugger Robot [Tue, 21 Mar 2017 19:37:53 +0000 (19:37 +0000)]
Merge "Update strings"

7 years agoUpdate activity alias for developer settings activity
Fan Zhang [Tue, 21 Mar 2017 19:31:31 +0000 (12:31 -0700)]
Update activity alias for developer settings activity

Fix: 36432817
Test: rerun abvt test adb shell am instrument -w -e class
com.android.androidbvt.SysBugReportTests
com.android.androidbvt/android.support.test.runner.AndroidJUnitRunner

Change-Id: I6d45448e83fc25ad9cc77aa0edd979add56e28cf

7 years agoUpdate SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
Sanket Padawe [Mon, 20 Mar 2017 22:08:07 +0000 (15:08 -0700)]
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.

Bug: 35767068
Test: No build failure on update.
Change-Id: Ib7211a9d0c10a717bfd5a7b22b8bea2b3973d12f

7 years agoUpdate strings
Fan Zhang [Tue, 21 Mar 2017 16:43:15 +0000 (09:43 -0700)]
Update strings

Fix: 36421690
Fix: 36432505
Fix: 36430514
Fix: 36431329
Fix: 36373539

Test: manual
Change-Id: Ia11d5ae340a7d8eef695ebe93d9e7fb50ecc91c0

7 years agoFinish removing N/A DO disclosures from search index
Bartosz Fabianowski [Mon, 20 Mar 2017 14:27:28 +0000 (15:27 +0100)]
Finish removing N/A DO disclosures from search index

DO disclosures referring to actions that the admin did not actually
take are hidden in the UI, but still show up in the search index. This
CL switches the remaining PreferenceControllers from setting visibility
to implementing isAvailable() instead.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I54360698f28b549b18cdc230e3b9087cf4e9ff4a

7 years agoDO Disclosures: Combine personal and work CA cert
Bartosz Fabianowski [Tue, 21 Mar 2017 12:57:27 +0000 (13:57 +0100)]
DO Disclosures: Combine personal and work CA cert

It was decided that rather than having two separate items for CA certs
in the personal and work spaces, we should have just one item that
lists the sum of installed certs.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Ic8a3db214a07992e3970262c2ce91f3df8a87773

7 years agoRemove "Device administration" heading
Bartosz Fabianowski [Mon, 20 Mar 2017 18:10:02 +0000 (19:10 +0100)]
Remove "Device administration" heading

This heading was meant to go away in the new IA.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I842673b01f62c2eb5eb51837d2c3d92829ac0ca0

7 years agoFinalize strings for enterprise privacy
Bartosz Fabianowski [Tue, 21 Mar 2017 10:19:38 +0000 (11:19 +0100)]
Finalize strings for enterprise privacy

A few more final string tweaks for the enterprise privacy page.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: Icf91a1188febb303fb1a9e9a5259a06c3b2324da

7 years agoMerge "Updating strings for unknown sources settings"
TreeHugger Robot [Tue, 21 Mar 2017 04:28:16 +0000 (04:28 +0000)]
Merge "Updating strings for unknown sources settings"

7 years agoMerge "Add progress bar and delay to WifiSettings refresh."
TreeHugger Robot [Tue, 21 Mar 2017 03:27:08 +0000 (03:27 +0000)]
Merge "Add progress bar and delay to WifiSettings refresh."

7 years agoUpdating strings for unknown sources settings
Suprabh Shukla [Tue, 21 Mar 2017 01:47:30 +0000 (18:47 -0700)]
Updating strings for unknown sources settings

Updated strings and removed some obsolete strings that were no longer
used. Removed unusued instance variable in AppStateInstallAppsBridge

Test: Manual

Bug: 36454399
Change-Id: I858bb388f311fd012527500cf35255d191b4dfb7

7 years agoCreate a way to inject a WifiTracker into WifiSettings.
Sundeep Ghuman [Tue, 21 Mar 2017 00:11:21 +0000 (17:11 -0700)]
Create a way to inject a WifiTracker into WifiSettings.

Bug: b/36403696
Test: Preliminary step to enable creation of Espresso tests b/36403696
Change-Id: I63c49cca0905a9d05964c11b3307ccf1859db7ec

7 years agoAdd progress bar and delay to WifiSettings refresh.
Sundeep Ghuman [Thu, 16 Mar 2017 03:38:02 +0000 (20:38 -0700)]
Add progress bar and delay to WifiSettings refresh.

This change shows the progress bar for 0.3 seconds before AccessPoints are
about to be refreshed and 1.7 afterwards for a total duration of roughly
2 seconds. This indirectly fixes issues with no longer having a refresh button,
indicates ongoing scanning to the user, and should help avoid user errors where
the user clicks on the wrong access point while the list is being updated.

In order to avoid excess UI movement, the progress bar off state is now set
to invisible rather than gone.

Bug: b/34774783
Test: Currently blocked on refactor, tracked in b/36403635 and will
start next week.
Change-Id: I2bb6b5b3d4611cdbfd7138c758785601896d05b9

7 years agoMerge "Update picture-in-picture settings to match mocks."
Winson Chung [Tue, 21 Mar 2017 00:28:57 +0000 (00:28 +0000)]
Merge "Update picture-in-picture settings to match mocks."

7 years agoMerge "Disable development settings when the switch bar turns off."
TreeHugger Robot [Tue, 21 Mar 2017 00:16:37 +0000 (00:16 +0000)]
Merge "Disable development settings when the switch bar turns off."

7 years agoMerge "Re-add the progress bar for storage preferences."
Daniel Nishi [Mon, 20 Mar 2017 22:54:02 +0000 (22:54 +0000)]
Merge "Re-add the progress bar for storage preferences."

7 years agoDisable development settings when the switch bar turns off.
Fan Zhang [Mon, 20 Mar 2017 21:56:09 +0000 (14:56 -0700)]
Disable development settings when the switch bar turns off.

Change-Id: Icc9953c95ed4d131231bb6ba95d60b43092a3833
Fix: 29274149
Test: make RunSettingsRoboTests

7 years agoMerge "Bluetooth: stop pairing service correctly" am: 4e32e87e57 am: b7c50119e5
Marie Janssen [Mon, 20 Mar 2017 21:56:37 +0000 (21:56 +0000)]
Merge "Bluetooth: stop pairing service correctly" am: 4e32e87e57 am: b7c50119e5
am: 912c74e02e

Change-Id: Ib822796906d81baad9a4b731a057b7ae14d7a355

7 years agoMerge "Bluetooth: stop pairing service correctly" am: 4e32e87e57
Marie Janssen [Mon, 20 Mar 2017 21:49:43 +0000 (21:49 +0000)]
Merge "Bluetooth: stop pairing service correctly" am: 4e32e87e57
am: b7c50119e5

Change-Id: I353995584681bd075491c09ae8db25f4223deda7

7 years agoMerge "Bluetooth: stop pairing service correctly"
Marie Janssen [Mon, 20 Mar 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Bluetooth: stop pairing service correctly"
am: 4e32e87e57

Change-Id: Ied66e2bf14771853be46c09b0720c9978d53e3c9

7 years agoMerge "Bluetooth: stop pairing service correctly"
Treehugger Robot [Mon, 20 Mar 2017 21:37:37 +0000 (21:37 +0000)]
Merge "Bluetooth: stop pairing service correctly"

7 years agoMerge "Revert "Use color accent as background color for app info pages.""
TreeHugger Robot [Mon, 20 Mar 2017 21:02:24 +0000 (21:02 +0000)]
Merge "Revert "Use color accent as background color for app info pages.""

7 years agoMerge "Update strings"
TreeHugger Robot [Mon, 20 Mar 2017 20:44:41 +0000 (20:44 +0000)]
Merge "Update strings"

7 years agoMerge "Finalize strings for enterprise privacy"
TreeHugger Robot [Mon, 20 Mar 2017 19:36:43 +0000 (19:36 +0000)]
Merge "Finalize strings for enterprise privacy"

7 years agoBluetooth: stop pairing service correctly
Marie Janssen [Mon, 20 Mar 2017 18:01:19 +0000 (11:01 -0700)]
Bluetooth: stop pairing service correctly

If BluetoothPairingService was stopped and restarted, it would receive
a null intent, and it also would not signal correctly when it needed to
be stopped.

Since restarts can happen, check that we are still bonding when starting.

Also prevent crashes when we might be called with a null intent.

Test: initiate pairing remotely, adb am kill service, notice no crash
Bug: 36130262
Change-Id: I408811935fdb36591826f4481d103cf4799db27e

7 years agoUpdate strings
Fan Zhang [Mon, 20 Mar 2017 19:06:39 +0000 (12:06 -0700)]
Update strings

Change-Id: Ic497a0a8511e375541da3b2d38e2f2d2b1b94c49
Fix: 27748242
Test: make RunSettingsRoboTests

7 years agoRevert "Use color accent as background color for app info pages."
Doris Ling [Mon, 20 Mar 2017 19:02:42 +0000 (19:02 +0000)]
Revert "Use color accent as background color for app info pages."

This reverts commit b2032416e974faf1f8af6426c5120b01f0b626fc.

Change-Id: Ie80e061e6ccecbcf96404c5349ab136da7ca599f

7 years agoRe-add the progress bar for storage preferences.
Daniel Nishi [Wed, 15 Mar 2017 21:00:13 +0000 (14:00 -0700)]
Re-add the progress bar for storage preferences.

This re-adds the progress bar and unifies the
StorageItemPreference and its alternate.

Change-Id: Iefc12b4b554306c706c83be232175dd2b84227b7
Fixes: 36223433
Test: Settings robotest

7 years agoFinalize strings for enterprise privacy
Bartosz Fabianowski [Mon, 20 Mar 2017 09:41:08 +0000 (10:41 +0100)]
Finalize strings for enterprise privacy

A few final string tweaks for the enterprise privacy page.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I7957263e768a588188e98f298eaae25ec77abeca

7 years agoMerge "Start removing N/A DO disclosures from search index"
TreeHugger Robot [Mon, 20 Mar 2017 18:03:51 +0000 (18:03 +0000)]
Merge "Start removing N/A DO disclosures from search index"

7 years agoMerge "Add color temperature preference to Night Display"
Christine Franks [Mon, 20 Mar 2017 18:03:44 +0000 (18:03 +0000)]
Merge "Add color temperature preference to Night Display"

7 years agoUpdate picture-in-picture settings to match mocks.
Winson Chung [Fri, 17 Mar 2017 22:48:38 +0000 (15:48 -0700)]
Update picture-in-picture settings to match mocks.

- Removing switches in top-level picture-in-picture settings, adding
  details screen for each app which contains the switch and some
  additional information.

Bug: 35957404
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib22df8a52ab857e071ec43dd3e5d1f5282db35cb

7 years agoAdd color temperature preference to Night Display
Christine Franks [Wed, 25 Jan 2017 00:12:24 +0000 (16:12 -0800)]
Add color temperature preference to Night Display

Bug: 32463283
Test: make RunSettingsRoboTests
Change-Id: Ibf3cf9af05b44a071603d3d7efa6e90ae00c823a

7 years agoThis CL updates the DO Disclosures page (aka "Enterprise Privacy")
Denis Kuznetsov [Fri, 10 Mar 2017 15:24:15 +0000 (16:24 +0100)]
This CL updates the DO Disclosures page (aka "Enterprise Privacy")
to make items that shows admin granted permissions actionable.
Item click will result in opening the list of apps for a permission.

Test: make RunSettingsRoboTests
Bug: 32692748

Change-Id: I5f2536b116998810857e379f48a26a1c40055590

7 years agoStart removing N/A DO disclosures from search index
Bartosz Fabianowski [Fri, 10 Mar 2017 14:47:14 +0000 (15:47 +0100)]
Start removing N/A DO disclosures from search index

DO disclosures referring to actions that the admin did not actually
take are hidden in the UI, but still show up in the search index. This
CL takes the following steps toward fixing this:
* Pass the list of PreferenceControllers to the search indexer
* Make the first two PrefrenceControllers set isAvailable() correctly

There are more disclosures to update, but the difficult work is done
as all others will follow the same pattern.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I7d3e248b80abe72b79fce7afa11f28a822de6986

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 18 Mar 2017 16:33:05 +0000 (16:33 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 18 Mar 2017 14:27:32 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9fece74d939eeb4c4d0c4a361e425744551f042d
Auto-generated-cl: translation import

7 years agoMove developer options related class to development package
Fan Zhang [Fri, 17 Mar 2017 23:19:26 +0000 (16:19 -0700)]
Move developer options related class to development package

Bug: 34203528
Test: none, purely moving classes around
Change-Id: I3cd1d257f948729fda5c04632e7ce9114c40bd0c

7 years agoFallback to default wallpaper picker if first choice fails
Fan Zhang [Fri, 17 Mar 2017 22:05:14 +0000 (15:05 -0700)]
Fallback to default wallpaper picker if first choice fails

- Add fallback logic in WallpaperSuggestionActivity
- Move some classes around
- Delete some unused class

Change-Id: Ifc8864428647a94f3ecae50d193c2156b2592ff3
Fix: 36140287
Test: make RunSettingsRoboTests

7 years agoMerge "Update string for Settings homepage."
TreeHugger Robot [Fri, 17 Mar 2017 23:41:13 +0000 (23:41 +0000)]
Merge "Update string for Settings homepage."

7 years agoMerge "Remove Index.java from old Search and its dependents"
TreeHugger Robot [Fri, 17 Mar 2017 23:23:49 +0000 (23:23 +0000)]
Merge "Remove Index.java from old Search and its dependents"

7 years agoMerge changes from topic 'FrictionIcons'
TreeHugger Robot [Fri, 17 Mar 2017 23:06:09 +0000 (23:06 +0000)]
Merge changes from topic 'FrictionIcons'

* changes:
  Revert picker icon sizes to 24dp.
  Comment changes from ag/1991360.
  Clean up wifi_friction icon unused states.
  Fix list item spacing for preferences.

7 years agoMerge "Add borders to the Automatic Storage Management switch."
Daniel Nishi [Fri, 17 Mar 2017 22:55:13 +0000 (22:55 +0000)]
Merge "Add borders to the Automatic Storage Management switch."

7 years agoMerge "Size and position the donut."
Daniel Nishi [Fri, 17 Mar 2017 22:54:43 +0000 (22:54 +0000)]
Merge "Size and position the donut."

7 years agoMerge "Update strings for Network & internet screen."
TreeHugger Robot [Fri, 17 Mar 2017 22:29:11 +0000 (22:29 +0000)]
Merge "Update strings for Network & internet screen."

7 years agoMerge changes from topic 'storage-o-strings'
Daniel Nishi [Fri, 17 Mar 2017 22:03:47 +0000 (22:03 +0000)]
Merge changes from topic 'storage-o-strings'

* changes:
  Use total size and not free in Storage summary.
  Add new strings.

7 years agoMerge "Cache the summary and icons for Security Settings injected tiles."
William Luh [Fri, 17 Mar 2017 22:01:38 +0000 (22:01 +0000)]
Merge "Cache the summary and icons for Security Settings injected tiles."

7 years agoUpdate string for Settings homepage.
Doris Ling [Fri, 17 Mar 2017 21:52:40 +0000 (14:52 -0700)]
Update string for Settings homepage.

Bug: 36375846
Test: builds
Change-Id: I97723b0a33f0fb04f7f4a0c5911a5d83a60d6014

7 years agoMerge "Attemp to fix a concurrent modify exception"
TreeHugger Robot [Fri, 17 Mar 2017 21:32:34 +0000 (21:32 +0000)]
Merge "Attemp to fix a concurrent modify exception"

7 years agoRemove Index.java from old Search and its dependents
Matthew Fritze [Thu, 16 Mar 2017 20:33:18 +0000 (13:33 -0700)]
Remove Index.java from old Search and its dependents

Test: make RunSettingsRoboTests
Bug: 3576394436192909
Change-Id:  If216e1eeb4c29e7372720c6228fa4e99ea2a9904

7 years agoMerge "Update strings for Apps & notifications screen."
TreeHugger Robot [Fri, 17 Mar 2017 21:05:24 +0000 (21:05 +0000)]
Merge "Update strings for Apps & notifications screen."

7 years agoUpdate strings for Network & internet screen.
Doris Ling [Fri, 17 Mar 2017 20:37:42 +0000 (13:37 -0700)]
Update strings for Network & internet screen.

Bug: 36296257
Test: builds
Change-Id: I417f6b9fd48725dd827a57f7af78f507fd9578fc

7 years agoAttemp to fix a concurrent modify exception
Fan Zhang [Fri, 17 Mar 2017 19:54:24 +0000 (12:54 -0700)]
Attemp to fix a concurrent modify exception

Change-Id: I039091d43ba8c378066c26dcca416534d0f52d21
Fix: 36347434
Test: existing tests pass

7 years agoMerge "Remove "remove account" from account sync detail page"
TreeHugger Robot [Fri, 17 Mar 2017 19:49:09 +0000 (19:49 +0000)]
Merge "Remove "remove account" from account sync detail page"

7 years agoRevert picker icon sizes to 24dp.
Sundeep Ghuman [Thu, 16 Mar 2017 01:21:43 +0000 (18:21 -0700)]
Revert picker icon sizes to 24dp.

Bug: b/36295036
Test: See screenshot in bug
Change-Id: I68af38163d6770e60195b245c38942c3844ead46

7 years agoComment changes from ag/1991360.
Sundeep Ghuman [Thu, 16 Mar 2017 01:12:35 +0000 (18:12 -0700)]
Comment changes from ag/1991360.

Bug: NA
Change-Id: I832f4459e8becdc5862c83c2b2efd5cee0d417c9
Test: NA

7 years agoClean up wifi_friction icon unused states.
Sundeep Ghuman [Thu, 16 Mar 2017 00:01:07 +0000 (17:01 -0700)]
Clean up wifi_friction icon unused states.

Bug: 34802842
Test: NA - nonfunctional refactor
Change-Id: I3ad11a8b65bf8ac8aea0a240afa74724d4fb34f3

7 years agoFix list item spacing for preferences.
Sundeep Ghuman [Wed, 15 Mar 2017 23:40:34 +0000 (16:40 -0700)]
Fix list item spacing for preferences.

Bug: b/33970117
Test: Existing tests pass - purely UI margin change. See screenshots in
bug.

Change-Id: I08ce646c9db2401c1462801ab39713fca8f5cc26

7 years agoMerge "Add lifecycle methods for managing the options menu."
Daniel Nishi [Fri, 17 Mar 2017 19:41:39 +0000 (19:41 +0000)]
Merge "Add lifecycle methods for managing the options menu."

7 years agoMerge "Update the spacing on the Storage header."
Daniel Nishi [Fri, 17 Mar 2017 19:41:19 +0000 (19:41 +0000)]
Merge "Update the spacing on the Storage header."

7 years agoUpdate strings for Apps & notifications screen.
Doris Ling [Fri, 17 Mar 2017 18:57:22 +0000 (11:57 -0700)]
Update strings for Apps & notifications screen.

Bug: 36376411
Test: builds
Change-Id: I92c08bfc0c6c85db07fede31eeef7fb9c0babbea

7 years agoShow channel description.
Julia Reynolds [Fri, 17 Mar 2017 19:10:29 +0000 (15:10 -0400)]
Show channel description.

Test: manual
Change-Id: I0965b0ad2c64571a01a5f221f8d344c60d54b53d

7 years agoCache the summary and icons for Security Settings injected tiles.
William Luh [Thu, 16 Mar 2017 17:05:04 +0000 (10:05 -0700)]
Cache the summary and icons for Security Settings injected tiles.

This helps the summary and icons load more smoothly when resuming
from recents.

Bug: 35994047
Test: make RunSettingsRoboTests
Change-Id: I763f7dd19f64007959e1281f0ff04ecd19bbfbfc

7 years agoRemove "remove account" from account sync detail page
Fan Zhang [Fri, 17 Mar 2017 18:01:55 +0000 (11:01 -0700)]
Remove "remove account" from account sync detail page

Change-Id: I40cc9d3d593c31a5e3b02553ac12f77c0825ed51
Fix: 36375879
Test: make RunSettingsRoboTests

7 years agoMerge "Change ripple in battery pages"
Lei Yu [Fri, 17 Mar 2017 17:11:46 +0000 (17:11 +0000)]
Merge "Change ripple in battery pages"

7 years agoRemove ambiguous wildcard import of org.mockito.Matchers.*
Paul Duffin [Fri, 17 Mar 2017 13:10:03 +0000 (13:10 +0000)]
Remove ambiguous wildcard import of org.mockito.Matchers.*

The recent upgrade to Mockito 2.7.13 has caused some problems
for grok (and new javac toolchain). The changed files used
wildcard imports to import the same methods from both Matchers
and Mockito.

This was not a problem previously because in the previous
version of Mockito the Mockito class extended the Matchers class
and so even though two methods with the same name were imported
they were not treated as a conflict because they were treated as
being the same method. In 2.7.13 the Mockito class no longer
extends the Matchers class instead they both extend the
ArgumentMatchers class and so for some reason javac no longer
treats them as the same method.

This was not detected by presubmit builds because jack is
still treating the methods as being the same.

Bug: 32912773
Test: m -j32 ANDROID_FORCE_JACK_ENABLED=disabled FrameworksWifiTests
Change-Id: I8c2b1dd39d2d653fe0fba19ed6421b7de25bb82f

7 years agoMerge "Fix NPE when building suggestion identifier."
TreeHugger Robot [Fri, 17 Mar 2017 01:47:59 +0000 (01:47 +0000)]
Merge "Fix NPE when building suggestion identifier."

7 years agoMerge "Add "Use open Wi-Fi automatically" setting."
TreeHugger Robot [Fri, 17 Mar 2017 01:34:24 +0000 (01:34 +0000)]
Merge "Add "Use open Wi-Fi automatically" setting."