Commit Graph

46131 Commits

Author SHA1 Message Date
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
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
TreeHugger Robot
e0e8d122fa Merge "Add action log in "Restrict app page"." 2018-05-22 00:34:35 +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
TreeHugger Robot
b084c97ef7 Merge "Misc GAR fixes" 2018-05-21 23:40:29 +00:00
Lei Yu
38ea79d024 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
2018-05-21 15:42:08 -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
Fan Zhang
71c402b152 Misc GAR fixes
- Use colorPrimary for EntityHeader background.
- Update data usage header text to be 87% black.

Change-Id: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 79773433
Test: robotests
Test: visual
2018-05-21 15:37:43 -07:00
TreeHugger Robot
14bf352f5e Merge "styleActionBar when updating header" 2018-05-21 22:18:57 +00:00
TreeHugger Robot
f703d1cb3b Merge "Set click listeners on displayPreference" 2018-05-21 22:18:53 +00:00
Matthew Fritze
a7aab5d7a2 Merge "Change Night Display slice title to "NightDisplay"" into pi-dev am: fbe8e0f11e
am: 29365aa2e7

Change-Id: Ifbe37d928fa60f560adbb971a07bb699b9777bab
2018-05-21 14:49:39 -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
b9659d352c [automerger skipped] DO NOT MERGE styleActionBar when updating header am: 77b5986032
am: 0e35a49546  -s ours

Change-Id: I3d2a8a59965ab4f06f5d0303f7c3bda71af90907
2018-05-21 14:08:57 -07:00
Beverly
0e35a49546 DO NOT MERGE styleActionBar when updating header
am: 77b5986032

Change-Id: Ibe961b91bdefe789e83015f3111aaaf6b8986ee0
2018-05-21 14:00:52 -07:00
Beverly
454673acca styleActionBar when updating header
Cherry-picked from pi-dev
If the activity has started, style the actionBar when the
header is being updated

Test: manual
Change-Id: Ide69fc0f6e8e5046105bd290d22d9f9a3df5c1ae
Fixes: 79983080
2018-05-21 16:55:27 -04: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
TreeHugger Robot
df5a331270 Merge "Dynamically showing "driving mode"" 2018-05-21 17:38:18 +00:00
Beverly
14a6856d37 Set click listeners on displayPreference
Cherry-picked from pi-dev
Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Fixes: 79728671
2018-05-21 11:19:13 -04:00
Beverly
6702e49734 Merge "Don't give onboarding dialog a fixed width" into pi-dev am: c4929ccc19
am: cacd84c669

Change-Id: I83391213e8382269190dbb83ff5d405616db5c17
2018-05-21 07:48:41 -07: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
b6443af9ae Merge "Update DND strings" into pi-dev am: c5ac30d1c7
am: a1397786fb

Change-Id: I4b16109b29be4f88a7bb424ce28ede8c562e3cae
2018-05-21 07:03:52 -07: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