Commit Graph

45157 Commits

Author SHA1 Message Date
Julia Reynolds
8eac6665e8 Merge "Fix field reordering on toggle switch" into pi-dev 2018-05-22 16:09:05 +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
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
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
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
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
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
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
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
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
Erik Kline
aee4396874 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
2018-05-22 10:52:55 +09: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
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
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
Antony Sargent
32acddc83e 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
2018-05-21 16:58:38 -07:00
Fan Zhang
3ab53bbd7b 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
2018-05-21 22:38:24 +00:00
Matthew Fritze
46f40517be 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
2018-05-21 15:13:20 -07:00
Matthew Fritze
29365aa2e7 Merge "Change Night Display slice title to "NightDisplay"" into pi-dev
am: fbe8e0f11e

Change-Id: I5e5659e629761631aaaa81e2f5e84a048339acee
2018-05-21 14:47:19 -07:00
TreeHugger Robot
fbe8e0f11e Merge "Change Night Display slice title to "NightDisplay"" into pi-dev 2018-05-21 21:37:38 +00:00
Beverly
0e35a49546 DO NOT MERGE styleActionBar when updating header
am: 77b5986032

Change-Id: Ibe961b91bdefe789e83015f3111aaaf6b8986ee0
2018-05-21 14:00:52 -07:00
Matthew Fritze
6394a1425c Change Night Display slice title to "NightDisplay"
Fixes: 80093098
Test: Slice browser for UI change
Change-Id: I4999d375f76d914095d4af234aaeb31e32fe798f
2018-05-21 20:52:15 +00:00
Beverly
77b5986032 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
2018-05-21 20:30:22 +00:00
Beverly
cacd84c669 Merge "Don't give onboarding dialog a fixed width" into pi-dev
am: c4929ccc19

Change-Id: Id3a296b4daad2dd2353ae31a3a91bea720a1ec47
2018-05-21 07:36:41 -07:00
TreeHugger Robot
c4929ccc19 Merge "Don't give onboarding dialog a fixed width" into pi-dev 2018-05-21 14:20:12 +00:00
Beverly Tai
a1397786fb Merge "Update DND strings" into pi-dev
am: c5ac30d1c7

Change-Id: Iec145e7fb343812dba25fccdb9b4ca48aa67641e
2018-05-21 06:59:21 -07:00
Beverly Tai
c5ac30d1c7 Merge "Update DND strings" into pi-dev 2018-05-21 13:51:10 +00:00
ryanywlin
7afd2e57a7 Move getLocalBtManager into FutureTask
am: 988dc9fbe6

Change-Id: Ifc3131dd15094c2eef4cbab05df46070b41928d0
2018-05-21 03:04:46 -07:00
ryanywlin
988dc9fbe6 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
2018-05-21 07:30:40 +00:00
hughchen
6a4174a079 Using static method to get summary resource id
am: 7f1345c3cd

Change-Id: I4acae01207e56a779d5f854e618127311b8408a4
2018-05-21 00:07:39 -07:00
hughchen
7f1345c3cd 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
2018-05-21 04:08:46 +00:00
Bill Yi
0c5ae7efd7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 36029724b2  -s ours

Change-Id: I919f8e980c6522783d2dbb8fbb94d84fba50dc9b
2018-05-20 07:05:48 -07:00
TreeHugger Robot
36029724b2 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-05-20 14:00:12 +00:00
Bill Yi
68dfe44ce4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8c15eb852603c17a804d652c236ee561a4218b22
2018-05-20 02:34:03 -07:00
Chienyuan
6b66b7e8cd Add developer options toggle for Bluetooth A2DP hardware offload
am: c96606500f

Change-Id: Ie5519aa3109964e4b3bc734242c72ae50a07101c
2018-05-19 23:41:40 -07:00
Chienyuan
c96606500f Add developer options toggle for Bluetooth A2DP hardware offload
Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
Merged-In: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
2018-05-18 23:40:22 -07:00
Salvador Martinez
13f97a29a6 Merge "Make user explicitly set security type for tether network" into pi-dev
am: 0e721c598e

Change-Id: I60f548f4d813a75f256aaf228c0e58232f376a16
2018-05-18 20:27:51 -07:00