Commit Graph

46157 Commits

Author SHA1 Message Date
Jayachandran C
127bfcfe2d Remove connectivity monitor switch from developer options
Test: Verify connectivity monitor switch is no more shown
      under developer options

Bug: 79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
2018-05-22 13:24:33 -07:00
hughchen
d9f1e1c049 Merge "When BT is off hide rename preference" into pi-dev am: a419c4717d
am: a29fe74817

Change-Id: I9e2068de44126344af52532fbe076acd9121883d
2018-05-22 11:18:15 -07:00
hughchen
a29fe74817 Merge "When BT is off hide rename preference" into pi-dev
am: a419c4717d

Change-Id: I505144261b8f06a33ee8cd5280707a2b35180178
2018-05-22 11:00:11 -07:00
TreeHugger Robot
a419c4717d Merge "When BT is off hide rename preference" into pi-dev 2018-05-22 17:48:31 +00:00
Matthew Fritze
17939388e3 [automerger skipped] Merge "Fix availability status for AOD gestures" into pi-dev am: 39f98e9018
am: 94b265ffe7  -s ours

Change-Id: I4eb4d086a1ad220969ce9f3ae90618db628a02f6
2018-05-22 10:19:54 -07:00
Matthew Fritze
94b265ffe7 Merge "Fix availability status for AOD gestures" into pi-dev
am: 39f98e9018

Change-Id: Iea6cab0934634ec124eb8e792d84ae06386ad03c
2018-05-22 10:09:17 -07:00
TreeHugger Robot
39f98e9018 Merge "Fix availability status for AOD gestures" into pi-dev 2018-05-22 16:50:12 +00:00
hughchen
4e2160904d 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
2018-05-22 09:35:34 -07:00
Julia Reynolds
b98f69c89a Merge "Fix field reordering on toggle switch" into pi-dev am: 8eac6665e8
am: 4bc1985a8c

Change-Id: I8db22efc4042ee91c2a3fbb3d6bfc632a91344b3
2018-05-22 09:24:48 -07:00
Julia Reynolds
4bc1985a8c Merge "Fix field reordering on toggle switch" into pi-dev
am: 8eac6665e8

Change-Id: I64a86334e106e5f0a4a8b3a6140411dc5d0ffabd
2018-05-22 09:17:29 -07:00
Julia Reynolds
8eac6665e8 Merge "Fix field reordering on toggle switch" into pi-dev 2018-05-22 16:09:05 +00:00
Julia Reynolds
49d8b0a3e4 Merge "Don't reset channel field when loading the app" into pi-dev am: 7ae4b0bbdc
am: a7aee6eea5

Change-Id: Ib6804e0fa325d04360b620aa36f043c6c707db1b
2018-05-22 08:51:52 -07:00
TreeHugger Robot
1a825ca803 Merge "Fix availability status for AOD gestures" 2018-05-22 15:48:21 +00:00
Julia Reynolds
a7aee6eea5 Merge "Don't reset channel field when loading the app" into pi-dev
am: 7ae4b0bbdc

Change-Id: I5f2a0fc22a698822bbe25c545950dc97364a66a2
2018-05-22 08:46:19 -07:00
TreeHugger Robot
7ae4b0bbdc Merge "Don't reset channel field when loading the app" into pi-dev 2018-05-22 15:36:22 +00:00
Matthew Fritze
f10765c884 [automerger skipped] Add Bluetooth Slice am: 25fc14c607
am: 225e3175af  -s ours

Change-Id: I7fa7596f781321dda580ea5b30a2026e950fab58
2018-05-22 08:19:11 -07:00
Matthew Fritze
225e3175af Add Bluetooth Slice
am: 25fc14c607

Change-Id: If9d6b6ce4728853523a58329712bb823b35ce087
2018-05-22 08:13:31 -07:00
Julia Reynolds
a65cec7b9a Fix field reordering on toggle switch
Every field needs an explicit order.

Test: manual
Change-Id: Iae533db9e9d240bd0dc14da04a1831fe23005f9e
Fixes: 79749266
2018-05-22 14:20:58 +00:00
Matthew Fritze
25fc14c607 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
2018-05-22 06:59:49 -07:00
Julia Reynolds
306e2d9f84 Don't reset channel field when loading the app
Only save data that's changed.

Change-Id: Iaa8265f543a7c1ec418d9d016986e0a253f28df6
Fixes: 79216856
Test: robo tests
2018-05-22 13:43:24 +00:00
Chia-I Wu
72a9730426 Merge "Show color modes from config_availableColorModes" into pi-dev am: 5c99a41a9c
am: 2dc9650a76

Change-Id: Ib248095ea777d13b4449369096953de574c98bb5
2018-05-22 00:31:52 -07:00
Chia-I Wu
2dc9650a76 Merge "Show color modes from config_availableColorModes" into pi-dev
am: 5c99a41a9c

Change-Id: I82de74655a8c000580355d857599278c445fe20e
2018-05-22 00:19:54 -07:00
Chia-I Wu
5c99a41a9c Merge "Show color modes from config_availableColorModes" into pi-dev 2018-05-22 07:09:53 +00:00
Lei Yu
563727631c Merge "When restrict, use uid inside AppInfo" into pi-dev am: 4376993a87
am: 0a084dadc2

Change-Id: I649e128ef5070562349de6951c9b3c2f1fbc1a76
2018-05-21 22:30:58 -07:00
Lei Yu
0a084dadc2 Merge "When restrict, use uid inside AppInfo" into pi-dev
am: 4376993a87

Change-Id: Ib882c9b94e05e56492d7a85db55564ca91ef46e1
2018-05-21 22:27:29 -07:00
TreeHugger Robot
4376993a87 Merge "When restrict, use uid inside AppInfo" into pi-dev 2018-05-22 05:22:24 +00:00
tim peng
874971905d [automerger skipped] Merge changes I6d4f8ec3,Id4c1e86c into pi-dev am: e3a87548e5
am: 002f385b62  -s ours

Change-Id: Id1c1ee7ec1a3726f10ad2c041ad413d63133214d
2018-05-21 22:06:52 -07:00
tim peng
002f385b62 Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
am: e3a87548e5

Change-Id: I6c063352b3c2fc6ab3b79baff222c976a5e14184
2018-05-21 21:58:29 -07:00
tim peng
e3a87548e5 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
2018-05-22 04:44:15 +00:00
TreeHugger Robot
0db3c80e81 Merge "Add Bluetooth Slice" 2018-05-22 03:57:35 +00:00
Antony Sargent
b8a1df8048 Merge "Update music, notifications, device information, and movies icons" into pi-dev am: 7ecbfd23f2
am: 0e0698ef27

Change-Id: I7b28e82b415f2f3c9c0e872ca2efa72c0f5831f4
2018-05-21 20:55:58 -07:00
Antony Sargent
0e0698ef27 Merge "Update music, notifications, device information, and movies icons" into pi-dev
am: 7ecbfd23f2

Change-Id: I2736fcb0c0f46d7c13c9c2732d55e423a670cb08
2018-05-21 20:52:28 -07:00
TreeHugger Robot
7ecbfd23f2 Merge "Update music, notifications, device information, and movies icons" into pi-dev 2018-05-22 03:45:32 +00:00
Fan Zhang
dfb505aa4c [automerger skipped] Merge "Misc GAR fixes" into pi-dev am: c9d258a11e
am: 59395efb39  -s ours

Change-Id: Id7323bb8cce7c04a49eab183e10aaf040c39bf8d
2018-05-21 20:16:17 -07:00
Fan Zhang
59395efb39 Merge "Misc GAR fixes" into pi-dev
am: c9d258a11e

Change-Id: I3bf714c5077004ed9c80fc7cb7515179a5df8e46
2018-05-21 20:12:22 -07:00
TreeHugger Robot
c9d258a11e Merge "Misc GAR fixes" into pi-dev 2018-05-22 03:08:15 +00:00
Matthew Fritze
d2bb2ab259 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.

Bug: 67997327
Test: robotests
Change-Id: Icfdcd77601ad1e64e0f6c352a8d691f0181515c8
2018-05-21 20:03:24 -07:00
Chia-I Wu
d4cfb414c3 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
2018-05-21 19:58:08 -07:00
hughchen
6d1f8e06f5 [automerger skipped] Merge "Dynamically showing "driving mode"" into pi-dev am: 346063dd5c
am: a4daa41df9  -s ours

Change-Id: I5ee36e42a3d82b6dc798f7739d31a988a72b99d1
2018-05-21 19:56:49 -07:00
hughchen
a4daa41df9 Merge "Dynamically showing "driving mode"" into pi-dev
am: 346063dd5c

Change-Id: I1109f44cbf0053e4e340ac933b442733bf11da26
2018-05-21 19:53:19 -07:00
TreeHugger Robot
346063dd5c Merge "Dynamically showing "driving mode"" into pi-dev 2018-05-22 02:48:34 +00:00
timhypeng
78eb5a81ba 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
2018-05-22 02:15:12 +00:00
timhypeng
4f636b90b8 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
2018-05-22 02:14:38 +00:00
Lei Yu
d06d1165eb 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
2018-05-22 02:02:06 +00:00
hughchen
a47e64829d 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
2018-05-22 01:48:19 +00:00
Lei Yu
a18cefa31e [automerger skipped] Merge "Add action log in "Restrict app page"." into pi-dev am: 8075586a2e
am: cc7b1cf5f2  -s ours

Change-Id: I9aeeaeef4b958a6fac1da54fe5205bb706273fb1
2018-05-21 18:42:56 -07:00
Lei Yu
cc7b1cf5f2 Merge "Add action log in "Restrict app page"." into pi-dev
am: 8075586a2e

Change-Id: Ie4387d9d5cc05742b26bda9bcd27eca49755809e
2018-05-21 18:39:23 -07:00
TreeHugger Robot
8075586a2e Merge "Add action log in "Restrict app page"." into pi-dev 2018-05-22 01:32:14 +00:00
tim peng
2de77f893b Merge changes from topic "BT_Discoverable_in_Connected_Devices"
* changes:
  Make device discoverable in Connected Devices settings page
  Add bluetooth discoverable footer preference in connected devices page
2018-05-22 01:23:34 +00:00
Lei Yu
95d067760b 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
2018-05-22 00:35:12 +00:00