OSDN Git Service
Alan Viverette [Fri, 2 Mar 2018 15:08:14 +0000 (15:08 +0000)]
Merge "Revert "Revert "Update to match now slice APIs"""
mcwilliams [Fri, 2 Mar 2018 00:01:13 +0000 (00:01 +0000)]
Settings: app¬ification children count increase
Sunshine is injecting App Usage stats into settings within Apps &
Notifications. Increase the children count to accomodate the extra
entity.
Bug:
74066149
Test: make -j56 RunSettingsRoboTests
Change-Id: I54ca06c942fbdf4e7451f6ed22f6f811b8a67747
TreeHugger Robot [Fri, 2 Mar 2018 03:07:00 +0000 (03:07 +0000)]
Merge "Update layout for app preference"
Fan Zhang [Fri, 2 Mar 2018 01:46:55 +0000 (17:46 -0800)]
Update layout for app preference
The summary and appendix string each takes 50% of horizontal space so
they don't push the other too far off.
Change-Id: I89d859f1ec46340695aa0ef75e4c81e6435b151a
Fixes:
74028565
Test: visual
Doris Ling [Thu, 1 Mar 2018 23:33:05 +0000 (15:33 -0800)]
Add a default preference controller for developer options.
- some of the preferences in the developer options page do not have a
preference controller associated with them, because they are simple
preference that do not require any update on the preference state at
all. However, they still need to be enabled/disabled when the master
developer options switch is turned on/off. Adding a default controller
to be used for these preferences.
Bug:
73955632
Test: manual
Change-Id: Ifb757dee2e5957d266ebb6ad5421d8ff9adbb142
TreeHugger Robot [Fri, 2 Mar 2018 00:48:08 +0000 (00:48 +0000)]
Merge "Support Slice type in SliceData"
Doris Ling [Thu, 1 Mar 2018 23:48:55 +0000 (23:48 +0000)]
Merge "Reduce max suggestion to show to 2."
TreeHugger Robot [Thu, 1 Mar 2018 23:35:45 +0000 (23:35 +0000)]
Merge "Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override."
Matthew Fritze [Wed, 28 Feb 2018 00:35:40 +0000 (16:35 -0800)]
Support Slice type in SliceData
Add a getter for Slice type for BasePreferenceController.
This facilitates the generation of all possible Slices for Settings
search and discovery for AGSA.
Bug:
62807132
Test: robotests
Change-Id: I2cba1fc72c95769ecc26c76d1f2faa49a285d077
Sean Callanan [Thu, 1 Mar 2018 22:39:23 +0000 (22:39 +0000)]
Merge "Add a preview image to the color mode preference."
TreeHugger Robot [Thu, 1 Mar 2018 22:33:30 +0000 (22:33 +0000)]
Merge "Gateway whitelist AdvancedConnectedDeviceDashboardFragment"
Doris Ling [Fri, 23 Feb 2018 22:59:41 +0000 (14:59 -0800)]
Reduce max suggestion to show to 2.
- since we now either have 1 or 2 suggestions, putting most layout
configuration in the xml instead of dynamically setting it in code.
- remove the suggestion header
- vertical center align the suggestion title text for 2 cards to make
the card with single line looks better.
- tint all suggestions icons.
Change-Id: I0130f15d530264e164e5afd7c091f165a4a6adc2
Fixes:
70573674
Fixes:
73293989
Fixes:
64986736
Test: visual and make RunSettingsRoboTests
Jack He [Thu, 1 Mar 2018 21:59:07 +0000 (21:59 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices" am:
57f8e717c7 -s ours am:
786fa66b6d
am:
6852928a75 -s ours
Change-Id: I5b67825bd9ff42bc467b078225630f4bafa7de2c
Doris Ling [Thu, 1 Mar 2018 18:33:14 +0000 (10:33 -0800)]
Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.
- default implementation has been added in the super class to handle
enabling/disabling the preference when the master developer options
switch it turned on/off. Removing all subclass that originally
implemented the methods that only contains the default behavior.
Bug:
73955632
Test: make RunSettingsRoboTests
Change-Id: I13c372c2ab498a5786b40cdc1ad3b5f3424abb5a
Jack He [Thu, 1 Mar 2018 21:44:28 +0000 (21:44 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices" am:
57f8e717c7 -s ours
am:
786fa66b6d
Change-Id: Ibec2e409300f36f36f2ec005233d32bd4c712e51
Jack He [Thu, 1 Mar 2018 21:40:20 +0000 (21:40 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"
am:
57f8e717c7 -s ours
Change-Id: I9b6e16237723c8a5903d011d2ee6a948c4f3ed47
Fan Zhang [Thu, 1 Mar 2018 17:49:34 +0000 (09:49 -0800)]
Gateway whitelist AdvancedConnectedDeviceDashboardFragment
- Discovered a few more fragments that weren't whitelisted, so I
whistlisted those as well.
- Also found ZenModeExternalRuleSettings is misconfigured in manifest
and no longer needed, so deleted all artifacts about this activity.
Fixes:
74060141
Test: atest
Change-Id: I159e403bfa6707e2939d075ecc2b8d2f13514153
Sean Callanan [Wed, 21 Feb 2018 02:57:29 +0000 (18:57 -0800)]
Add a preview image to the color mode preference.
For high-color displays, it's desirable to have a preview of the
impact the user's color preference will have on images. This commit
adds that functionality to ColorModePreferenceFragment by extending
RadioButtonPickerFragment to support static content.
The image used here is a placeholder pending UX.
Bug:
73670362
Test: Added a test verifying that the preview is added correctly.
Change-Id: Id54316bbef6a22291a8e8acbda5fcb2839b88c23
Treehugger Robot [Thu, 1 Mar 2018 19:34:20 +0000 (19:34 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"
Oscar Shu [Thu, 1 Mar 2018 17:20:50 +0000 (17:20 +0000)]
Merge "Adding Wifi setting to special_access settings"
Anton Hansson [Thu, 1 Mar 2018 10:26:48 +0000 (10:26 +0000)]
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."
TreeHugger Robot [Thu, 1 Mar 2018 04:45:25 +0000 (04:45 +0000)]
Merge "ChooseLockPassword should not show "confirm" until min length is met"
TreeHugger Robot [Thu, 1 Mar 2018 03:25:41 +0000 (03:25 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"
Kevin Chyn [Thu, 1 Mar 2018 03:02:00 +0000 (03:02 +0000)]
Merge "ChooseLockPassword shows wrong string when confirmed password is wrong"
Jack He [Tue, 27 Feb 2018 06:58:56 +0000 (22:58 -0800)]
Bluetooth: Use config value for default max connected audio devices
* The first option in Bluetooth max connected audio devices preference
should be using system default
* Added template based string array to show system default in the list
preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
development setting is disabled or when system default is chosen
* Fix a bug by saving selected value to list preference so that it
persists when user re-opens development settings
Bug:
64767509
Test: Enable and disable multi-device mode in development settings
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Merged-In: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Jack He [Wed, 28 Feb 2018 00:42:57 +0000 (16:42 -0800)]
Bluetooth: Use config value for default max connected audio devices
* The first option in Bluetooth max connected audio devices preference
should be using system default
* Added template based string array to show system default in the list
preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
development setting is disabled or when system default is chosen
* Added instrumentation test to check preference array size and whether
default value is within range of preference array values
* Modified robolectric tests to verify the updated behaviors
Bug:
64767509
Test: Enable and disable multi-device mode in development settings
make -j32 RunSettingsRoboTests
atest SettingsUnitTests:BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Kevin Chyn [Thu, 1 Mar 2018 01:52:34 +0000 (17:52 -0800)]
ChooseLockPassword should not show "confirm" until min length is met
Fixes:
70561465
Test: manual test with setting pin/pw
Change-Id: I545202f508fa7b1a73b9a2e66a8f8216deba7555
TreeHugger Robot [Thu, 1 Mar 2018 01:42:32 +0000 (01:42 +0000)]
Merge "Auto update summary for mobile network preference."
TreeHugger Robot [Thu, 1 Mar 2018 01:29:22 +0000 (01:29 +0000)]
Merge "Remove custom updateState() if it's just setting summary"
Kevin Chyn [Thu, 1 Mar 2018 01:28:15 +0000 (17:28 -0800)]
ChooseLockPassword shows wrong string when confirmed password is wrong
Fixes:
70561469
Test: try to setup a password/pin, but type in a wrong pw/pin
when confirming. the button should stay as "confirm" instead of
reverting to "next"
Change-Id: Iea570c2d869b9d561b26046d30d08f40abca0c93
TreeHugger Robot [Wed, 28 Feb 2018 23:46:32 +0000 (23:46 +0000)]
Merge "Under "recent location requests", add "See all""
TreeHugger Robot [Wed, 28 Feb 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Update tests for string changes"
Fan Zhang [Wed, 28 Feb 2018 22:06:11 +0000 (14:06 -0800)]
Auto update summary for mobile network preference.
Change-Id: Ic7854ef4d2d710dff528244a5e5fb75708740d2e
Fixes:
73504707
Test: robotests
Fan Zhang [Wed, 28 Feb 2018 01:12:26 +0000 (17:12 -0800)]
Remove custom updateState() if it's just setting summary
Change-Id: I6311d67d6ba11961a6814b91dcd8e37a2e17df40
Fixes:
73950519
Test: rerun robotests
Maggie [Sat, 27 Jan 2018 00:30:17 +0000 (16:30 -0800)]
Under "recent location requests", add "See all"
Under Settings -> Security & Location -> Location, add "See all" button
under recent location requests
On location settings page, display at most 3 recent location requests.
If there are more than 3, show a "see all" button.
When user clicks "See all", take them to a new fragment with all recent
location requests.
Test: Robo
Test: Manual
Bug:
70350519
Change-Id: Id1f9a8da1593814a8f30f8e6ec8ac75fb10f6672
TreeHugger Robot [Wed, 28 Feb 2018 20:52:27 +0000 (20:52 +0000)]
Merge "Add summary for Display->Color settings."
TreeHugger Robot [Wed, 28 Feb 2018 20:27:32 +0000 (20:27 +0000)]
Merge "Force shortcuts to launch as the root of a new task"
TreeHugger Robot [Wed, 28 Feb 2018 19:37:57 +0000 (19:37 +0000)]
Merge "Fix crash when launching about phone v2 through intent"
Doris Ling [Tue, 27 Feb 2018 00:09:51 +0000 (16:09 -0800)]
Add summary for Display->Color settings.
Change-Id: Ia1332b4e3333099878ee52342c64b3d8595fdd94
Fixes:
73773857
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 28 Feb 2018 19:12:05 +0000 (11:12 -0800)]
Force shortcuts to launch as the root of a new task
Otherwise it will try to find a existing task affinity, which can be
stale.
Test: manual
Change-Id: If2982612bf8789e726757e9fda1f70af47274a9e
Fixes:
73710228
Salvador Martinez [Wed, 28 Feb 2018 18:23:58 +0000 (10:23 -0800)]
Update tests for string changes
Some tests were validating strings for enhanced estimates. Since
those strings have been updated the tests in Settings need to be
updated to reflect those changes.
Test: Is a test change
Bug:
73290523
Bug:
72996609
Bug:
73904361
Change-Id: I5a175eb89539544bc10647a5373bd064efa3dbf7
Fan Zhang [Wed, 28 Feb 2018 18:03:43 +0000 (10:03 -0800)]
Fix crash when launching about phone v2 through intent
Change-Id: Ife6c24a7127fc9821760f9f5b58a33437711bc25
Fixes:
73971752
Test: atest
TreeHugger Robot [Wed, 28 Feb 2018 18:03:14 +0000 (18:03 +0000)]
Merge "Remove duplicate test"
Jan Nordqvist [Wed, 28 Feb 2018 17:21:16 +0000 (17:21 +0000)]
Merge "Fixed failing launch of Data usage activty from data saver suggestion."
Anton Hansson [Wed, 28 Feb 2018 11:26:29 +0000 (11:26 +0000)]
packages/apps/Settings: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841
Change-Id: I8dbe76fee202a571b1492b598035cc7b92e4433f
Victor Chang [Wed, 28 Feb 2018 10:59:36 +0000 (10:59 +0000)]
Merge "Fix not delivering result to fragment using SubSettingLauncher"
TreeHugger Robot [Wed, 28 Feb 2018 08:40:29 +0000 (08:40 +0000)]
Merge "Change PreferenceController#getSummary return type."
Fan Zhang [Tue, 27 Feb 2018 18:30:11 +0000 (10:30 -0800)]
Change PreferenceController#getSummary return type.
Return CharSequence instead of String.
All user visible string should be modeled as CharSequence.
Bug:
73950519
Test: robotest
Change-Id: I30befef0c33f94351d4a2774e283bd1ed804aa8b
Andreas Gampe [Wed, 28 Feb 2018 05:16:29 +0000 (05:16 +0000)]
Merge changes I06df032d,Ib923de28 am:
59a548b940 am:
34f43b50ce
am:
fd99b8b009 -s ours
Change-Id: I0eab3f2bdcbacb8a4fc3bc4d171299c74c806c56
Andreas Gampe [Wed, 28 Feb 2018 04:51:14 +0000 (04:51 +0000)]
Merge changes I06df032d,Ib923de28 am:
59a548b940
am:
34f43b50ce
Change-Id: I0bb87911c11685bcc8caa58d5a3ce9cf044e4ee1
Andreas Gampe [Wed, 28 Feb 2018 04:37:06 +0000 (04:37 +0000)]
Merge changes I06df032d,Ib923de28
am:
59a548b940
Change-Id: I4d1314379ba77c07b64c3ca5c77a61f9a54d4c1d
Treehugger Robot [Wed, 28 Feb 2018 03:34:13 +0000 (03:34 +0000)]
Merge changes I06df032d,Ib923de28
* changes:
Settings: Disable failing tests.
Settings: Fix assertThat in tests
Chen Xu [Wed, 28 Feb 2018 02:49:11 +0000 (02:49 +0000)]
Merge "rename emergency tone settings" am:
2054a4d6d4 am:
eb664426c5
am:
648d302ba7
Change-Id: I5edb5cf7b20b022b2a2514ec96bf99e38cf2c007
Chen Xu [Wed, 28 Feb 2018 02:43:59 +0000 (02:43 +0000)]
Merge "rename emergency tone settings" am:
2054a4d6d4
am:
eb664426c5
Change-Id: I9c4bd1ae9ac8c13732686949ce316c7abf8e5c75
Chen Xu [Wed, 28 Feb 2018 02:38:23 +0000 (02:38 +0000)]
Merge "rename emergency tone settings"
am:
2054a4d6d4
Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa
Andreas Gampe [Mon, 26 Feb 2018 20:22:29 +0000 (12:22 -0800)]
Settings: Disable failing tests.
Temporarily disable.
(cherry picked from commit
b506fb9b1918fe4b2144339567862ff03b3942cc)
Bug:
73892008
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherrypick
Merged-In: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Chen Xu [Wed, 28 Feb 2018 02:17:26 +0000 (02:17 +0000)]
Merge "rename emergency tone settings"
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
(cherry picked from commit
22bad556a1863bff80c4ec517ada315f7b01890e)
Bug:
73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Exempt-From-Owner-Approval: Cherrypick
Merged-In: Ib923de28ce5dcf79b9dec718306877e31e58e024
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024
TreeHugger Robot [Wed, 28 Feb 2018 02:09:21 +0000 (02:09 +0000)]
Merge "Fix search non-indexable update"
Salvador Martinez [Wed, 28 Feb 2018 01:43:12 +0000 (17:43 -0800)]
Remove duplicate test
PowerUsageSummary was duplicated to have the old version exist
in developer options. This test is for a debug feature which will
not be released so there is no point in having a duplicate of it
as well. This CL removes that test.
Test: Is a test CL
Bug:
73513677
Change-Id: Ia3ed704018cfaa0b05c4bf0f2799ff8151ba4b85
TreeHugger Robot [Wed, 28 Feb 2018 00:42:28 +0000 (00:42 +0000)]
Merge "Remove unused classes and tests."
Fan Zhang [Wed, 28 Feb 2018 00:05:02 +0000 (16:05 -0800)]
Fix search non-indexable update
- When creating preference conotrollers, if one fail, skip that one
instead of giving up entire operation.
- Fix BatterySaverController by providing a existing looper.
Change-Id: Iefe443b7fa91e51515c5c247fab4d9588867baef
Fixes:
73903739
Test: robotest
Lei Yu [Wed, 28 Feb 2018 00:13:37 +0000 (00:13 +0000)]
Merge "Fix the AnomalyCleanUpJobService"
TreeHugger Robot [Tue, 27 Feb 2018 23:39:33 +0000 (23:39 +0000)]
Merge "Add logging for battery tip"
TreeHugger Robot [Tue, 27 Feb 2018 23:39:33 +0000 (23:39 +0000)]
Merge "Add metric for BatteryTipDialogFragmnt"
fionaxu [Tue, 27 Feb 2018 23:14:57 +0000 (15:14 -0800)]
rename emergency tone settings
Bug:
67470733
Test: Manual
Change-Id: I67e223c2db662f518fa306221190d4646668c4d3
Alan Viverette [Tue, 27 Feb 2018 22:10:26 +0000 (22:10 +0000)]
Revert "Revert "Update to match now slice APIs""
This reverts commit
80c806abd60f8d8381f6654fd2f708f5d915f0bf.
Bug:
73250914
Test: make && make checkbuild, manual testing
Alan Viverette [Tue, 27 Feb 2018 22:08:31 +0000 (22:08 +0000)]
Merge "Revert "Update to match now slice APIs""
Alan Viverette [Tue, 27 Feb 2018 20:12:57 +0000 (20:12 +0000)]
Revert "Update to match now slice APIs"
This reverts commit
2d96005aba3a509fc801f9a05d61786d8ad78218.
Reason for revert: prebuilt revert
Bug:
73903252
Bug:
73876473
Bug:
73875529
Bug:
73866916
Change-Id: I5d47a7c5ddebc16c1c508f5bb48ace809cbaf273
Jerry Zhang [Fri, 23 Feb 2018 22:43:58 +0000 (14:43 -0800)]
Remove unused classes and tests.
Old usb pages have been replaced by UsbDetailsFragment
and UsbDefaultFragment. Old connected devices has
been replaced by new connected devices.
Bug:
70848054
Test: Passes
Change-Id: I538cbb88d4f878449a83da9a4a0381e74e840c6a
TreeHugger Robot [Tue, 27 Feb 2018 20:28:43 +0000 (20:28 +0000)]
Merge "Delete unused layout: preference_importance_slider."
jackqdyulei [Fri, 23 Feb 2018 18:59:27 +0000 (10:59 -0800)]
Fix the AnomalyCleanUpJobService
1. Invoke it in BOOT_COMPLETED
2. Set it periodic
3. Change the anomaly history from 3 days to 30 days
Bug:
72385333
Test: RunSettingsRoboTests
Change-Id: Ib59a85f3dffd6c094ff400a75bec44d4c65bce44
Yueming Wang [Mon, 26 Feb 2018 14:46:21 +0000 (14:46 +0000)]
Revert "Change Settings to use URL_FILTERED and blocks menu options when DPC Apns are enforced."
This reverts commit
ab1f251defe8ee327917b1788f5702ae2c231a47.
Reason for revert: As per discussion in b/
72484718, we are going to
block Access Point Name entry point in Network&Settings, so we no longer
need the change in ApnSettings fragment itself.
Bug:
72484718
Change-Id: I337a03e8baebaedb9e9ab83ccc4f7cf2f9c562c8
Alex Chau [Tue, 27 Feb 2018 12:02:19 +0000 (12:02 +0000)]
Merge "Revert "Fix the crash when editing or deleting APN.""
TreeHugger Robot [Tue, 27 Feb 2018 03:03:27 +0000 (03:03 +0000)]
Merge "Remove controller definitions from code"
jackqdyulei [Tue, 27 Feb 2018 01:20:19 +0000 (17:20 -0800)]
Add logging for battery tip
When it is triggered, we log the type of battery tip.
Bug:
3662211
Test: RunSettingsRoboTests
Change-Id: Iab1034008796b6b21eee53297b2e574199693f7e
Jan Nordqvist [Mon, 26 Feb 2018 21:55:00 +0000 (13:55 -0800)]
Fixed failing launch of Data usage activty from data saver suggestion.
After introducing the new data usage UI behind a feature flag a bug was
introduced that causes the data saver suggestion to throw an exception
from a missing class reference in "legacy" mode.
Bug:
73648306
Test: manual
Change-Id: I4fcd2bd0f55931f40738266dca94a55fea5087b3
Fan Zhang [Tue, 27 Feb 2018 01:00:45 +0000 (17:00 -0800)]
Remove controller definitions from code
- With recent changes in DashboardFragment, if a controller is
implemented using BasePreferenceController AND it's defined in xml, it
should "just work (tm)".
Change-Id: I05ec175e3c3df706df1a59c4bd9c2db3bf7e19d2
Fixes:
73668763
Test: rerun robotest
TreeHugger Robot [Tue, 27 Feb 2018 00:28:07 +0000 (00:28 +0000)]
Merge "Search highlight polish"
TreeHugger Robot [Tue, 27 Feb 2018 00:08:16 +0000 (00:08 +0000)]
Merge "Fix PictureInPictureSettingsTest."
TreeHugger Robot [Mon, 26 Feb 2018 23:00:22 +0000 (23:00 +0000)]
Merge "Report High usage even in a short period"
jackqdyulei [Mon, 26 Feb 2018 22:46:49 +0000 (14:46 -0800)]
Add metric for BatteryTipDialogFragmnt
Bug:
73888115
Test: Build
Change-Id: I234865f31658d3a44df4aa9521b6b2ea0f26f287
Fan Zhang [Fri, 23 Feb 2018 18:36:04 +0000 (10:36 -0800)]
Search highlight polish
- Blink when starting highlight
- Extend highlight to 15 seconds
- Fade out when stopping highlight
Bug:
73313161
Test: visual
Change-Id: Ie6c3d640566f2eecc501d4c4f96df512171ff4b6
Tracy Zhou [Mon, 26 Feb 2018 22:13:53 +0000 (14:13 -0800)]
Fix PictureInPictureSettingsTest.
Bug:
73892555
Bug:
73892683
Test: m RunSettingsRoboTests
Change-Id: Id4145600240f12c2cc2f5aed978a1fe65fd1fd74
Andreas Gampe [Mon, 26 Feb 2018 22:24:23 +0000 (22:24 +0000)]
Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am:
ffec1a0c68 am:
8d0a8ed985
am:
2658f2059c
Change-Id: Id4b3c85c9bf4bf7b76910e895b57d21e66c0e85f
Andreas Gampe [Mon, 26 Feb 2018 22:16:49 +0000 (22:16 +0000)]
Merge changes I67dbf04a,I032f6741 am:
727ec42d8d am:
6b24cc5769
am:
257f42fd9d
Change-Id: I8bb1a61f255a1c80242ac264f061f15153df12aa
Andreas Gampe [Mon, 26 Feb 2018 22:16:43 +0000 (22:16 +0000)]
Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am:
ffec1a0c68
am:
8d0a8ed985
Change-Id: I0eb99bc2c2d1ec67c23ad020627a2cf43cfbb71d
Andreas Gampe [Mon, 26 Feb 2018 22:08:50 +0000 (22:08 +0000)]
Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
am:
ffec1a0c68
Change-Id: Ibac8d021d8d65fdab91f682b9fbfc0231a61a93f
Andreas Gampe [Mon, 26 Feb 2018 22:08:42 +0000 (22:08 +0000)]
Merge changes I67dbf04a,I032f6741 am:
727ec42d8d
am:
6b24cc5769
Change-Id: Ib649c224f4496785ae1eba0bce3a411eca8aa1bd
Andreas Gampe [Mon, 26 Feb 2018 22:01:25 +0000 (22:01 +0000)]
Merge changes I67dbf04a,I032f6741
am:
727ec42d8d
Change-Id: I4c8ce0fa68ae3fbf2a3e835d165a766b6e6aad5c
Treehugger Robot [Mon, 26 Feb 2018 22:00:19 +0000 (22:00 +0000)]
Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
* changes:
Settings: Disable failing test
Settings: Disable failing test
Settings: Fix assertThat in tests
TreeHugger Robot [Mon, 26 Feb 2018 21:51:01 +0000 (21:51 +0000)]
Merge changes I06df032d,Ib923de28
* changes:
Settings: Disable failing tests.
Settings: Fix assertThat in tests
xshu [Thu, 1 Feb 2018 01:40:37 +0000 (17:40 -0800)]
Adding Wifi setting to special_access settings
In the settings app, allow users to override app permission for
CHANGE_WIFI_STATE for every application that declared that permission.
Bug:
70562620
Test: compile, robotests
Manual test:
Flash build to device (walleye)
Download iPass from playstore
Open iPass and try connect to a wifi network; verify success
Open settings -> Apps & notifications -> Advanced -> Special app access
-> Wifi access
Select iPass from the list
Toggle the switch to off
Open iPass and try connect to a wifi network; verify failure
Change-Id: Ib2be4c83988a81ba7831d096c9b1980462e66903
Treehugger Robot [Mon, 26 Feb 2018 21:36:15 +0000 (21:36 +0000)]
Merge changes I67dbf04a,I032f6741
* changes:
Settings: Disable failing assert
Settings: Fix assertThat in test
Andreas Gampe [Mon, 26 Feb 2018 20:14:05 +0000 (12:14 -0800)]
Settings: Disable failing assert
Temporarily disable.
Bug:
73892004
Test: m RunSettingsRoboTests
Change-Id: I67dbf04ae59e54632155c3eda67c70335147fd19
Andreas Gampe [Mon, 26 Feb 2018 20:28:42 +0000 (12:28 -0800)]
Settings: Disable failing test
Disable temporarily.
Bug:
73892683
Test: m RunSettingsRoboTests
Change-Id: I8dcc30b0b090fef1f2fd8fa3c6de7bf69e8b97a9
Andreas Gampe [Mon, 26 Feb 2018 20:27:56 +0000 (12:27 -0800)]
Settings: Disable failing test
Disable temporarily.
Bug:
73892555
Test: m RunSettingsRoboTests
Change-Id: I85292ad20de2cb169825eccb19dff1eb82e6fbe1
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
Bug:
73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie0ab35348fa56c73e6257477a50ff130450e74e7
Andreas Gampe [Mon, 26 Feb 2018 20:22:29 +0000 (12:22 -0800)]
Settings: Disable failing tests.
Temporarily disable.
Bug:
73892008
Test: m RunSettingsRoboTests
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
Bug:
73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024