OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
Julia Reynolds [Wed, 23 May 2018 23:11:08 +0000 (16:11 -0700)]
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
am: 718c344daf

Change-Id: Ib539d391b3517e9281337a5ba3972bd8ca21caf1

6 years agoMerge "Remove connectivity monitor switch from developer options" into pi-dev
Jayachandran Chinnakkannu [Wed, 23 May 2018 22:12:55 +0000 (15:12 -0700)]
Merge "Remove connectivity monitor switch from developer options" into pi-dev
am: 8d7ccc0074

Change-Id: Ic68439308f7d591595876488afa76e57b9414089

6 years agoMerge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 21:49:56 +0000 (21:49 +0000)]
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev

6 years agoMerge "Hook up blocked keys" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:49:32 +0000 (14:49 -0700)]
Merge "Hook up blocked keys" into pi-dev
am: a60ea38f67

Change-Id: I464e3068051471f05512068bc020866f8d8d8f85

6 years agoMerge "Inline slider with header" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:48:51 +0000 (14:48 -0700)]
Merge "Inline slider with header" into pi-dev
am: 666ee4fa14

Change-Id: I16c56185628f7dde2a8dbd04bd4b8509163a2fbe

6 years agoMerge "Use standard displayPreference" into pi-dev
Julia Reynolds [Wed, 23 May 2018 21:48:08 +0000 (14:48 -0700)]
Merge "Use standard displayPreference" into pi-dev
am: eba0723a57

Change-Id: I1394513d9d57577af2a5e0a253ff6ecb548e936d

6 years agoMerge "Hide entire hidden field for non-hidden networks" into pi-dev
Daichi Ueura [Wed, 23 May 2018 21:47:28 +0000 (14:47 -0700)]
Merge "Hide entire hidden field for non-hidden networks" into pi-dev
am: 2c793dfeff

Change-Id: I3cd2bb7d87e371a8db5b1ea693c424b6314f08f2

6 years agoMerge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
Fan Zhang [Wed, 23 May 2018 21:46:45 +0000 (14:46 -0700)]
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
am: 87dfe60ad0

Change-Id: I30f5d13f0c5f430b09585ad2114f0f1ad98eebc9

6 years agoMerge "Return null when setting can't be changed." into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:45:58 +0000 (14:45 -0700)]
Merge "Return null when setting can't be changed." into pi-dev
am: c7b90ee998

Change-Id: I3112475e7cbe477f94c129be78d55b430760df75

6 years agoMerge "Add Location Slice" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:45:10 +0000 (14:45 -0700)]
Merge "Add Location Slice" into pi-dev
am: 53f6b7cb06

Change-Id: I0a18f0a70e9a653acf3fad8bf7c68763aa4d24a3

6 years agoMerge "Clear indexing before adding all Slices" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:44:03 +0000 (14:44 -0700)]
Merge "Clear indexing before adding all Slices" into pi-dev
am: 842ea91baa

Change-Id: I6a1a0903ac0e7538e013eebe6071d1b7ff496412

6 years agoMerge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
Antony Sargent [Wed, 23 May 2018 21:43:19 +0000 (14:43 -0700)]
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
am: e0e49140d2

Change-Id: Ie05b424868cfd46dce36b792a4006dd2cce0aeba

6 years agoMerge "Update storage, videogame, and vpn icons" into pi-dev
Antony Sargent [Wed, 23 May 2018 21:41:37 +0000 (14:41 -0700)]
Merge "Update storage, videogame, and vpn icons" into pi-dev
am: 28dc3917a9

Change-Id: I7904f669edc41f2d19369a02bb8efdd360d4445f

6 years agoMerge "Update airplane mode key to match framework constant" into pi-dev
Matthew Fritze [Wed, 23 May 2018 21:40:55 +0000 (14:40 -0700)]
Merge "Update airplane mode key to match framework constant" into pi-dev
am: 6be5e331cf

Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb

6 years agoMerge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
Erik Kline [Wed, 23 May 2018 21:25:29 +0000 (14:25 -0700)]
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
am: 5a0a7ef4bb

Change-Id: I01f80ccf9c733d280b38250e6735717004cbec1b

6 years agoMerge "Remove connectivity monitor switch from developer options" into pi-dev
Jayachandran Chinnakkannu [Wed, 23 May 2018 20:57:30 +0000 (20:57 +0000)]
Merge "Remove connectivity monitor switch from developer options" into pi-dev

6 years agoDO NOT MERGE Handle usageevents for work profile apps
Julia Reynolds [Mon, 21 May 2018 18:17:26 +0000 (14:17 -0400)]
DO NOT MERGE Handle usageevents for work profile apps

Test: robotests
Change-Id: Ifdc6e456d76614220b2052e6ca8a8f3676d0e2ee
Fixes: 79142791

6 years agoMerge "Hook up blocked keys" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 20:41:22 +0000 (20:41 +0000)]
Merge "Hook up blocked keys" into pi-dev

6 years agoMerge "Inline slider with header" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 19:32:41 +0000 (19:32 +0000)]
Merge "Inline slider with header" into pi-dev

6 years agoHook up blocked keys
Matthew Fritze [Wed, 23 May 2018 19:25:23 +0000 (12:25 -0700)]
Hook up blocked keys

Block any slice in onBind that is the in the blacklist

Change-Id: I9687d07cbfef5fcb94842046bc5dc3296eed4252
Fixes: 80195653
Test: robotests

6 years agoMerge "Use standard displayPreference" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 18:44:28 +0000 (18:44 +0000)]
Merge "Use standard displayPreference" into pi-dev

6 years agoInline slider with header
Matthew Fritze [Tue, 22 May 2018 13:50:49 +0000 (06:50 -0700)]
Inline slider with header

Add a header to the slider slices to allow for a second line of text.
This is important to add more context to slices outside of settings.

Fixes: 80157462
Test: robotests
Merged-In: Ida90c9377afb19de320dfce54175f51eee088cfe
Change-Id: I1a1be345e84cbd9f300440e6431d4b331d051dac

6 years agoMerge "Hide entire hidden field for non-hidden networks" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 18:15:04 +0000 (18:15 +0000)]
Merge "Hide entire hidden field for non-hidden networks" into pi-dev

6 years agoMerge "Add isSliceable API to BasePrefController" into pi-dev
Matthew Fritze [Wed, 23 May 2018 17:52:35 +0000 (10:52 -0700)]
Merge "Add isSliceable API to BasePrefController" into pi-dev
am: ef950c24bd

Change-Id: Idbcc5c9960270b5713478aa5f22d524dc52fba91

6 years agoMerge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
TreeHugger Robot [Wed, 23 May 2018 17:16:48 +0000 (17:16 +0000)]
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev

6 years agoMerge "Return null when setting can't be changed." into pi-dev
TreeHugger Robot [Wed, 23 May 2018 17:08:29 +0000 (17:08 +0000)]
Merge "Return null when setting can't be changed." into pi-dev

6 years agoRemove connectivity monitor switch from developer options
Jayachandran C [Mon, 21 May 2018 23:41:40 +0000 (16:41 -0700)]
Remove connectivity monitor switch from developer options

Test: Verify connectivity monitor switch is no more shown
      under developer options

Bug: 79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
Merged-In: I755885398b92a726b0b979815c33793abe01ea66

6 years agoUse standard displayPreference
Julia Reynolds [Wed, 23 May 2018 15:09:34 +0000 (11:09 -0400)]
Use standard displayPreference

For notification fields. This is required for them to
display properly within an 'advanced' preference category.

Test: robotests, manual
Change-Id: I1e1ff0e801e136c6a86a0d9164ed21d4160e897a
Fixes: 80132743

6 years agoMerge "Add Location Slice" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 16:23:09 +0000 (16:23 +0000)]
Merge "Add Location Slice" into pi-dev

6 years agoHide entire hidden field for non-hidden networks
Daichi Ueura [Tue, 22 May 2018 09:36:59 +0000 (18:36 +0900)]
Hide entire hidden field for non-hidden networks

This CL hides not just hidden network spinner but entire
hidden field when a user is adding a network from scanned
network list.

Test: robotests
Bug: 80114851
Change-Id: I8b29fd764d62af1e46beaa7d26fae97848f4efe6

6 years agoAdd Location Slice
Matthew Fritze [Fri, 18 May 2018 17:23:34 +0000 (10:23 -0700)]
Add Location Slice

Location is an intent-only Slice.

Test: Robotests
Change-Id: Ie9ed05be2224f2c4b393ed201d5f313f80183edc
Merged-In: I07e27683b46fe4ded8215009a983bb909555fb59
Fixes: 67997314

6 years agoConvert BatterySaverButton controller to Slice compatible.
Fan Zhang [Tue, 22 May 2018 21:12:32 +0000 (14:12 -0700)]
Convert BatterySaverButton controller to Slice compatible.

- Update preference key to match the key defined in SettingsSlicesContract
- Model TwoStateButtonPreference similar to TwoStatePreference (add
  setChecked, isChecked method)
- Remove TwoStateButtonPreferenceController entirely because all methods
  are moved into Preference directly for better encapsulation.
- Make BatterySaverButtonPrefController direclty implement
  TogglePreferenceController. It was not possible before because the
  interface between TwoStateButtonPreferene is too different from
  TwoStatePreference.

Bug: 80106671
Test: robotests
Change-Id: Ib72807dcf1b36e959e08df8d80538c3f9f79b76d
Merged-In: Ib72807dcf1b36e959e08df8d80538c3f9f79b76d

6 years agoMerge "Clear indexing before adding all Slices" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 13:26:19 +0000 (13:26 +0000)]
Merge "Clear indexing before adding all Slices" into pi-dev

6 years agoMerge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 05:17:28 +0000 (05:17 +0000)]
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev

6 years agoMerge "Update storage, videogame, and vpn icons" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 03:24:03 +0000 (03:24 +0000)]
Merge "Update storage, videogame, and vpn icons" into pi-dev

6 years agoReturn null when setting can't be changed.
Matthew Fritze [Wed, 23 May 2018 01:24:06 +0000 (18:24 -0700)]
Return null when setting can't be changed.

If a Slice cannot be changed, return null instead of
an error slice.

Bug: 80155832
Test: robotests
Change-Id: I843fee76cf19d49cc994062059cb231f222120b2
Merged-In: Ib94136c449c6d9c1911f89833bba62fd2263daa4

6 years agoClear indexing before adding all Slices
Matthew Fritze [Tue, 22 May 2018 21:26:00 +0000 (14:26 -0700)]
Clear indexing before adding all Slices

Before we index, add a call to clear indexed data before
indexing again. It's an optional call.

Fixes: 80065409
Test: robotests

Change-Id: Iddb0ce02c50d84b51fbf6fc2be0bdc9aa1f5987a

6 years agoMerge "Update airplane mode key to match framework constant" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 03:00:47 +0000 (03:00 +0000)]
Merge "Update airplane mode key to match framework constant" into pi-dev

6 years agoMerge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
TreeHugger Robot [Wed, 23 May 2018 01:02:39 +0000 (01:02 +0000)]
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev

6 years agoUpdate storage, videogame, and vpn icons
Antony Sargent [Wed, 23 May 2018 00:09:28 +0000 (17:09 -0700)]
Update storage, videogame, and vpn icons

Also remove duplicate ic_settings_storage.xml, rename
ic_settings_storage_white.xml to ic_storage_white.xml, and fix up
references.

Bug: 77982107
Test: manual
Change-Id: Icd78c2a2a8d200cb8819d58887455883acdbc668

6 years agoUpdate airplane mode key to match framework constant
Matthew Fritze [Tue, 22 May 2018 20:04:38 +0000 (13:04 -0700)]
Update airplane mode key to match framework constant

Change pref key for airplane mode to "airplane_mode" to match the
constant declared in SettingsSlicesContract.

Bug: 80106671
Test: robotests
Change-Id: I625bed440dd7f1f8509cd00ced5ba67f08a0e737
Merged-In: I898befffbdafc3004fc127414edd04f60ff2554e

6 years agoUpdate photo, accessibility, memory, sim, and warning icons
Antony Sargent [Tue, 22 May 2018 21:27:09 +0000 (14:27 -0700)]
Update photo, accessibility, memory, sim, and warning icons

Bug: 77982107
Test: manual
Change-Id: I8076d1f6115b335693413c9177be79c7af9317a5

6 years agoMerge "Add isSliceable API to BasePrefController" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 23:40:24 +0000 (23:40 +0000)]
Merge "Add isSliceable API to BasePrefController" into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 22 May 2018 22:43:38 +0000 (15:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 1dbed5f4f2  -s ours

Change-Id: If38ef61a43b054ab10cc9f58062c43ab19b36347

6 years agoAdd isSliceable API to BasePrefController
Matthew Fritze [Sat, 19 May 2018 00:59:26 +0000 (17:59 -0700)]
Add isSliceable API to BasePrefController

Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.

Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.

Test: robotests
Change-Id: I85848c2cdf3e151fa94b33dd1dc5c0374ef94b5b
Merged-In: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
Fixes: 79779103

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 22:37:33 +0000 (22:37 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Make VideoPreference not important for talkback." into pi-dev
Fan Zhang [Tue, 22 May 2018 21:59:09 +0000 (14:59 -0700)]
Merge "Make VideoPreference not important for talkback." into pi-dev
am: 32c3b87db9

Change-Id: I222b3a652c3345a66799c3920c3183128b37254b

6 years agoMerge "Make VideoPreference not important for talkback." into pi-dev
TreeHugger Robot [Tue, 22 May 2018 21:31:09 +0000 (21:31 +0000)]
Merge "Make VideoPreference not important for talkback." into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 22 May 2018 21:13:06 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I06fb64abf52b7fdc00173dbc1ce5cb01cb9fcc61

6 years agoMerge "When BT is off hide rename preference" into pi-dev
hughchen [Tue, 22 May 2018 18:00:11 +0000 (11:00 -0700)]
Merge "When BT is off hide rename preference" into pi-dev
am: a419c4717d

Change-Id: I505144261b8f06a33ee8cd5280707a2b35180178

6 years agoMerge "When BT is off hide rename preference" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 17:48:31 +0000 (17:48 +0000)]
Merge "When BT is off hide rename preference" into pi-dev

6 years agoMerge "Fix availability status for AOD gestures" into pi-dev
Matthew Fritze [Tue, 22 May 2018 17:09:17 +0000 (10:09 -0700)]
Merge "Fix availability status for AOD gestures" into pi-dev
am: 39f98e9018

Change-Id: Iea6cab0934634ec124eb8e792d84ae06386ad03c

6 years agoMerge "Fix availability status for AOD gestures" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 16:50:12 +0000 (16:50 +0000)]
Merge "Fix availability status for AOD gestures" into pi-dev

6 years agoMake VideoPreference not important for talkback.
Fan Zhang [Tue, 22 May 2018 16:33:34 +0000 (09:33 -0700)]
Make VideoPreference not important for talkback.

Change-Id: I9856afbd3f5140fa0c426bcc443d2f33e2ffc335
Fixes: 79887358
Test: talkback

6 years agoWhen BT is off hide rename preference
hughchen [Mon, 21 May 2018 12:46:57 +0000 (20:46 +0800)]
When BT is off hide rename preference

* Hide the preference when BT is off, shown preference when BT is on.

Bug: 78247352
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceNamePreferenceControllerTest
Change-Id: Id1e11c7b546d7ac5bc8606e8645d07d77f2b522f

6 years agoMerge "Fix field reordering on toggle switch" into pi-dev
Julia Reynolds [Tue, 22 May 2018 16:17:29 +0000 (09:17 -0700)]
Merge "Fix field reordering on toggle switch" into pi-dev
am: 8eac6665e8

Change-Id: I64a86334e106e5f0a4a8b3a6140411dc5d0ffabd

6 years agoMerge "Fix field reordering on toggle switch" into pi-dev
Julia Reynolds [Tue, 22 May 2018 16:09:05 +0000 (16:09 +0000)]
Merge "Fix field reordering on toggle switch" into pi-dev

6 years agoMerge "Don't reset channel field when loading the app" into pi-dev
Julia Reynolds [Tue, 22 May 2018 15:46:19 +0000 (08:46 -0700)]
Merge "Don't reset channel field when loading the app" into pi-dev
am: 7ae4b0bbdc

Change-Id: I5f2a0fc22a698822bbe25c545950dc97364a66a2

6 years agoMerge "Don't reset channel field when loading the app" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 15:36:22 +0000 (15:36 +0000)]
Merge "Don't reset channel field when loading the app" into pi-dev

6 years agoAdd Bluetooth Slice
Matthew Fritze [Tue, 22 May 2018 15:13:31 +0000 (08:13 -0700)]
Add Bluetooth Slice
am: 25fc14c607

Change-Id: If9d6b6ce4728853523a58329712bb823b35ce087

6 years agoFix field reordering on toggle switch
Julia Reynolds [Tue, 22 May 2018 13:09:22 +0000 (09:09 -0400)]
Fix field reordering on toggle switch

Every field needs an explicit order.

Test: manual
Change-Id: Iae533db9e9d240bd0dc14da04a1831fe23005f9e
Fixes: 79749266

6 years agoAdd Bluetooth Slice
Matthew Fritze [Thu, 3 May 2018 22:12:18 +0000 (15:12 -0700)]
Add Bluetooth Slice

Bluetooth slice is added a special case, due to the migration of
bluetooth to a Switch Bar instead of a preference with a controller.

Change-Id: I8b70bb66c862255a4e8d2426ac09939ba6197624
Merged-In: Icfdcd77601ad1e64e0f6c352a8d691f0181515c8
Fixes: 67997327
Test: robotests

6 years agoDon't reset channel field when loading the app
Julia Reynolds [Tue, 22 May 2018 13:07:46 +0000 (09:07 -0400)]
Don't reset channel field when loading the app

Only save data that's changed.

Change-Id: Iaa8265f543a7c1ec418d9d016986e0a253f28df6
Fixes: 79216856
Test: robo tests

6 years agoMerge "Show color modes from config_availableColorModes" into pi-dev
Chia-I Wu [Tue, 22 May 2018 07:19:54 +0000 (00:19 -0700)]
Merge "Show color modes from config_availableColorModes" into pi-dev
am: 5c99a41a9c

Change-Id: I82de74655a8c000580355d857599278c445fe20e

6 years agoMerge "Show color modes from config_availableColorModes" into pi-dev
Chia-I Wu [Tue, 22 May 2018 07:09:53 +0000 (07:09 +0000)]
Merge "Show color modes from config_availableColorModes" into pi-dev

6 years agoMerge "When restrict, use uid inside AppInfo" into pi-dev
Lei Yu [Tue, 22 May 2018 05:27:29 +0000 (22:27 -0700)]
Merge "When restrict, use uid inside AppInfo" into pi-dev
am: 4376993a87

Change-Id: Ib882c9b94e05e56492d7a85db55564ca91ef46e1

6 years agoMerge "When restrict, use uid inside AppInfo" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 05:22:24 +0000 (05:22 +0000)]
Merge "When restrict, use uid inside AppInfo" into pi-dev

6 years agoMerge changes I6d4f8ec3,Id4c1e86c into pi-dev
tim peng [Tue, 22 May 2018 04:58:29 +0000 (21:58 -0700)]
Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
am: e3a87548e5

Change-Id: I6c063352b3c2fc6ab3b79baff222c976a5e14184

6 years agoMerge changes I6d4f8ec3,Id4c1e86c into pi-dev
tim peng [Tue, 22 May 2018 04:44:15 +0000 (04:44 +0000)]
Merge changes I6d4f8ec3,Id4c1e86c into pi-dev

* changes:
  Make device discoverable in Connected Devices settings page
  Add bluetooth discoverable footer preference in connected devices page

6 years agoMerge "Update music, notifications, device information, and movies icons" into pi-dev
Antony Sargent [Tue, 22 May 2018 03:52:28 +0000 (20:52 -0700)]
Merge "Update music, notifications, device information, and movies icons" into pi-dev
am: 7ecbfd23f2

Change-Id: I2736fcb0c0f46d7c13c9c2732d55e423a670cb08

6 years agoMerge "Update music, notifications, device information, and movies icons" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 03:45:32 +0000 (03:45 +0000)]
Merge "Update music, notifications, device information, and movies icons" into pi-dev

6 years agoMerge "Misc GAR fixes" into pi-dev
Fan Zhang [Tue, 22 May 2018 03:12:22 +0000 (20:12 -0700)]
Merge "Misc GAR fixes" into pi-dev
am: c9d258a11e

Change-Id: I3bf714c5077004ed9c80fc7cb7515179a5df8e46

6 years agoMerge "Misc GAR fixes" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 03:08:15 +0000 (03:08 +0000)]
Merge "Misc GAR fixes" into pi-dev

6 years agoShow color modes from config_availableColorModes
Chia-I Wu [Thu, 15 Mar 2018 15:35:20 +0000 (08:35 -0700)]
Show color modes from config_availableColorModes

Check config_availableColorModes to decide which color mode options
to show.

Bug: 73824924
Bug: 73825738
Test: 2016, 2017, and 2018 devices
Change-Id: I42915595348061ff4b3f2fdf14753e96dfcb2052

6 years agoMerge "Dynamically showing "driving mode"" into pi-dev
hughchen [Tue, 22 May 2018 02:53:19 +0000 (19:53 -0700)]
Merge "Dynamically showing "driving mode"" into pi-dev
am: 346063dd5c

Change-Id: I1109f44cbf0053e4e340ac933b442733bf11da26

6 years agoMerge "Dynamically showing "driving mode"" into pi-dev
TreeHugger Robot [Tue, 22 May 2018 02:48:34 +0000 (02:48 +0000)]
Merge "Dynamically showing "driving mode"" into pi-dev

6 years agoMake device discoverable in Connected Devices settings page
timhypeng [Fri, 11 May 2018 07:41:10 +0000 (15:41 +0800)]
Make device discoverable in Connected Devices settings page

* Set preference title by bluetooth state
* Enable bluetooth discoverable mode in Connected device page
* Add more test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb
Merged-In: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb

6 years agoAdd bluetooth discoverable footer preference in connected devices page
timhypeng [Fri, 11 May 2018 06:38:22 +0000 (14:38 +0800)]
Add bluetooth discoverable footer preference in connected devices page

* Dynamicly add preference in controller
* Add test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b
Merged-In: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b

6 years agoWhen restrict, use uid inside AppInfo
Lei Yu [Mon, 21 May 2018 20:15:24 +0000 (13:15 -0700)]
When restrict, use uid inside AppInfo

Before this CL, we use packageManager to get uid for battery
restriction. However it may not be correct all the time.

For example, RestrictedAppDetails will be opened as main user
however inside we also show work profile apps, in this case
we can't get correct uid by only using normal API in PackageManager.

This CL change it to use uid from AppInfo, which is correct all
the time.

Bug: 79992590
Test: RunSettingsRoboTests
Change-Id: Id33a5f6409d6bace0d756e5ac06432acb8b2cf65

6 years agoFactor in PRIVATE_DNS_MODE_DEFAULTSETTING value
Erik Kline [Thu, 17 May 2018 05:43:20 +0000 (14:43 +0900)]
Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value

This setting can be used to change the in-code default.

Test: as follows
    - built, flashed, booted
    - make -j50 RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest passes
    - make -j50 RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest passes
Bug: 79719289
Change-Id: I27e5fb9cc66dde1df72395c22179bca3f62ef782

6 years agoDynamically showing "driving mode"
hughchen [Wed, 16 May 2018 09:12:29 +0000 (17:12 +0800)]
Dynamically showing "driving mode"

Dynamically showing "driving mode" in "Connection preferences" summary.
In cl/196700988, when driving mode is available/not available will using
Settings.System to set flag.
Example :
driving mode is available : Settings.System.putInt(mContentResolver,
DRIVING_MODE_SETTINGS_ENABLED, 1)
driving mode is not available : Settings.System.putInt(mContentResolver,
DRIVING_MODE_SETTINGS_ENABLED, 0);

This CL using Settings.System to get driving mode state that used to dynamically
showing "driving mode"

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I702fa4fbc752c7b470184cf58f2e604f9f28c057
Merged-In: I702fa4fbc752c7b470184cf58f2e604f9f28c057

6 years agoMerge "Add action log in "Restrict app page"." into pi-dev
Lei Yu [Tue, 22 May 2018 01:39:23 +0000 (18:39 -0700)]
Merge "Add action log in "Restrict app page"." into pi-dev
am: 8075586a2e

Change-Id: Ie4387d9d5cc05742b26bda9bcd27eca49755809e

6 years agoMerge "Add action log in "Restrict app page"." into pi-dev
TreeHugger Robot [Tue, 22 May 2018 01:32:14 +0000 (01:32 +0000)]
Merge "Add action log in "Restrict app page"." into pi-dev

6 years agoAdd action log in "Restrict app page".
Lei Yu [Fri, 18 May 2018 21:12:55 +0000 (14:12 -0700)]
Add action log in "Restrict app page".

This CL adds confirmation dialog in "Restrict app page". By go through
BatteryTipDialogFragment, it will find the correct action, in which
we already have log:
1. RestrictAppAction
2. UnRestrictAppAction

Bug: 79992590
Test: RunSettingsRoboTests
Change-Id: I179fbd17a012528fdfacf42e4a93943eaefff23d
Merged-In: I179fbd17a012528fdfacf42e4a93943eaefff23d

6 years agoUpdate music, notifications, device information, and movies icons
Antony Sargent [Mon, 21 May 2018 23:42:11 +0000 (16:42 -0700)]
Update music, notifications, device information, and movies icons

Also delete duplicated ic_settings_notifications.xml and point existing
usages to ic_notifications.xml

Bug: 77982107
Test: manual
Change-Id: Ia7896598c6334aa97faf392b17e6bc3c17d58599

6 years agoMisc GAR fixes
Fan Zhang [Mon, 21 May 2018 19:07:28 +0000 (12:07 -0700)]
Misc GAR fixes

- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual

6 years agoFix availability status for AOD gestures
Matthew Fritze [Thu, 17 May 2018 18:27:46 +0000 (11:27 -0700)]
Fix availability status for AOD gestures

Double tap screen to wake and lift to check phone
are dependent on AOD - and should return DISABLED DEPENDENT
SETTING when AOD is turned on.

Test: robotests
Change-Id: Ib3f40c38bb210d0f512736746dc45a1b844c6bee
Merged-In: Ib246070ee853185459628b2584ddbae72e15a2f8
Fixes: 79779562

6 years agoMerge "Change Night Display slice title to "NightDisplay"" into pi-dev
Matthew Fritze [Mon, 21 May 2018 21:47:19 +0000 (14:47 -0700)]
Merge "Change Night Display slice title to "NightDisplay"" into pi-dev
am: fbe8e0f11e

Change-Id: I5e5659e629761631aaaa81e2f5e84a048339acee

6 years agoMerge "Change Night Display slice title to "NightDisplay"" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 21:37:38 +0000 (21:37 +0000)]
Merge "Change Night Display slice title to "NightDisplay"" into pi-dev

6 years agoDO NOT MERGE styleActionBar when updating header
Beverly [Mon, 21 May 2018 21:00:52 +0000 (14:00 -0700)]
DO NOT MERGE styleActionBar when updating header
am: 77b5986032

Change-Id: Ibe961b91bdefe789e83015f3111aaaf6b8986ee0

6 years agoChange Night Display slice title to "NightDisplay"
Matthew Fritze [Mon, 21 May 2018 20:36:45 +0000 (13:36 -0700)]
Change Night Display slice title to "NightDisplay"

Fixes: 80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f

6 years agoDO NOT MERGE styleActionBar when updating header
Beverly [Mon, 21 May 2018 17:27:09 +0000 (13:27 -0400)]
DO NOT MERGE styleActionBar when updating header

If the activity has started, style the actionBar when the
header is being updated

Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Bug: 79983080

6 years agoMerge "Don't give onboarding dialog a fixed width" into pi-dev
Beverly [Mon, 21 May 2018 14:36:41 +0000 (07:36 -0700)]
Merge "Don't give onboarding dialog a fixed width" into pi-dev
am: c4929ccc19

Change-Id: Id3a296b4daad2dd2353ae31a3a91bea720a1ec47

6 years agoMerge "Don't give onboarding dialog a fixed width" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 14:20:12 +0000 (14:20 +0000)]
Merge "Don't give onboarding dialog a fixed width" into pi-dev

6 years agoMerge "Update DND strings" into pi-dev
Beverly Tai [Mon, 21 May 2018 13:59:21 +0000 (06:59 -0700)]
Merge "Update DND strings" into pi-dev
am: c5ac30d1c7

Change-Id: Iec145e7fb343812dba25fccdb9b4ca48aa67641e

6 years agoMerge "Update DND strings" into pi-dev
Beverly Tai [Mon, 21 May 2018 13:51:10 +0000 (13:51 +0000)]
Merge "Update DND strings" into pi-dev

6 years agoMove getLocalBtManager into FutureTask
ryanywlin [Mon, 21 May 2018 10:04:46 +0000 (03:04 -0700)]
Move getLocalBtManager into FutureTask
am: 988dc9fbe6

Change-Id: Ifc3131dd15094c2eef4cbab05df46070b41928d0

6 years agoMove getLocalBtManager into FutureTask
ryanywlin [Fri, 18 May 2018 23:34:52 +0000 (07:34 +0800)]
Move getLocalBtManager into FutureTask

Utils.getLocalBtManager in constructor violate StrictMode
ThreadPolicy, move it into FutureTask.

Bug: 79985175
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: I0a14be18e4766245e7d165239d47ab54fa5e4acb

6 years agoUsing static method to get summary resource id
hughchen [Mon, 21 May 2018 07:07:39 +0000 (00:07 -0700)]
Using static method to get summary resource id
am: 7f1345c3cd

Change-Id: I4acae01207e56a779d5f854e618127311b8408a4

6 years agoUsing static method to get summary resource id
hughchen [Wed, 9 May 2018 06:33:52 +0000 (14:33 +0800)]
Using static method to get summary resource id

* Using getConnectedDevicesSummaryResourceId() to get the resource id to shown the summary.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I268de4d989fe01eff463a5ec1c0a174e094e56c0