TreeHugger Robot
8885e93f90
Merge "Import translations. DO NOT MERGE"
2018-06-01 06:06:36 +00:00
Ryan Lin
1e7e455495
Merge "Handle Bluetooth is not supported on emulator" into pi-dev am: 942b07da93
...
am: 15eb7fe8c4
2018-05-31 22:41:53 -07:00
Bill Yi
cd69e1f808
Import translations. DO NOT MERGE
...
Change-Id: I01a0990e89de81507a540cbaa6b1bd1b2de3b2f9
Auto-generated-cl: translation import
2018-05-31 21:25:44 -07:00
Ryan Lin
15eb7fe8c4
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
...
am: 942b07da93
2018-05-31 17:16:12 -07:00
Ryan Lin
942b07da93
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
2018-05-31 23:22:30 +00:00
Beverly
dc0c9a0ab9
Merge "No need for "and" - ListFormatter adds it" into pi-dev am: fa01fcb2c9
...
am: 60d57976bc
2018-05-31 16:03:12 -07:00
Matthew Fritze
adff8a2643
Merge "Make Settings Slider Slices one row" into pi-dev am: 4199198ec2
...
am: 2c7fe6f8ea
2018-05-31 15:38:17 -07:00
TreeHugger Robot
2760369d4f
Merge "Added keyword 'bug' to Send Device Feedback"
2018-05-31 21:35:15 +00:00
Beverly
60d57976bc
Merge "No need for "and" - ListFormatter adds it" into pi-dev
...
am: fa01fcb2c9
2018-05-31 14:24:11 -07:00
Matthew Fritze
2c7fe6f8ea
Merge "Make Settings Slider Slices one row" into pi-dev
...
am: 4199198ec2
2018-05-31 11:37:19 -07:00
TreeHugger Robot
fa01fcb2c9
Merge "No need for "and" - ListFormatter adds it" into pi-dev
2018-05-31 18:12:00 +00:00
TreeHugger Robot
4199198ec2
Merge "Make Settings Slider Slices one row" into pi-dev
2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26
No need for "and" - ListFormatter adds it
...
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
2018-05-31 09:32:26 -04:00
TreeHugger Robot
e68598380e
Merge "Shown toast when BT turned on"
2018-05-31 07:00:27 +00:00
ryanywlin
d67314e771
Handle Bluetooth is not supported on emulator
...
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor
Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
2018-05-31 12:48:13 +08:00
Weien Wang
31f17d88d0
Merge "Fix the battery icon on the battery page when low battery"
2018-05-31 04:37:05 +00:00
hughchen
3051845840
Shown toast when BT turned on
...
* Shown "Bluetooth turned on" toast only when BT turned on in "Pair new device"
* Add test to verify shown toast function can be called when BT turned on.
Bug: 79383997
Test: make -j42 RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I25f75aaa04063d9ef8a0df4bb06aeaa70d7ac146
2018-05-31 11:03:37 +08:00
TreeHugger Robot
d3fede04a8
Merge "Add strings for multiple user footer"
2018-05-30 23:53:34 +00:00
TreeHugger Robot
32f70ecd95
Merge "Use settingslib shadows in Settings robotest"
2018-05-30 23:00:20 +00:00
Matthew Fritze
93307cdb69
Make Settings Slider Slices one row
...
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.
Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
2018-05-30 15:39:43 -07:00
Fan Zhang
fb6f95fb99
Add strings for multiple user footer
...
Bug: 72319180
Test: rebuild
Change-Id: If12ff75555aa362c8663dc19ca6ba4d99a7c8a47
2018-05-30 15:38:26 -07:00
TreeHugger Robot
ae20b1ef0c
Merge "Added new keywords to adaptive brightness results."
2018-05-30 22:35:38 +00:00
Fan Zhang
6fc7ebd72b
Use settingslib shadows in Settings robotest
...
Change-Id: Ieae5d65bb5efdbc4c91455d1f722e84fe9e60116
Fixes: 80428049
Test: robotest
2018-05-30 14:36:26 -07:00
Michael
6097fe9c3e
Added new keywords to adaptive brightness results.
...
Added two new strings to the string resource. Added smart brightness and
dyanmic brightness.
Fixes: 80481385
Test: UI change
Change-Id: Iafde3501d41cac13d5f6da16e4575518c8e7ffa9
2018-05-30 14:26:40 -07:00
Andre Garivay
81bb3cfbf4
Added keyword 'bug' to Send Device Feedback
...
Added string resource for keywords
Change-Id: I174a401bab93672a2260cf342c6bf52c311383d3
Fixes: 80419062
Test: UI change
2018-05-30 14:26:16 -07:00
Hansong Zhang
f1dc08a608
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours am: acfbc0eff4
...
am: 6197f671b2
2018-05-30 14:11:13 -07:00
Hansong Zhang
6197f671b2
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 am: 7cc441bf2f -s ours
...
am: acfbc0eff4
2018-05-30 13:59:15 -07:00
Hansong Zhang
acfbc0eff4
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14
...
am: 7cc441bf2f
2018-05-30 13:41:41 -07:00
Hansong Zhang
7cc441bf2f
DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d
...
am: 48aa959b14
2018-05-30 13:32:52 -07:00
TreeHugger Robot
2c032fdd19
Merge "Stop using AppState for app icon in DomainAppPreference."
2018-05-30 20:31:54 +00:00
Hansong Zhang
48aa959b14
DO NOT MERGE Give PBAP permission only after user confirms
...
am: e36ca3e96d
2018-05-30 13:23:53 -07:00
TreeHugger Robot
ad90960b6e
Merge "delete DeviceInfoSettings and activity, pref xml"
2018-05-30 20:14:50 +00:00
Fan Zhang
179f537173
Stop using AppState for app icon in DomainAppPreference.
...
Change-Id: I080ed9d2d7d70c092bec54ed4e4b6bb2b6c8f453
Fixes: 77967533
Test: robotest
2018-05-30 12:33:26 -07:00
TreeHugger Robot
50437769a2
Merge "Skip device index job if caller is not Settings app."
2018-05-30 18:40:21 +00:00
Hansong Zhang
aaf637ff5f
Merge "Give PBAP permission only after user confirms" into pi-dev am: fcac34d723
...
am: cd09ff50bb
2018-05-30 10:46:36 -07:00
Hansong Zhang
cd09ff50bb
Merge "Give PBAP permission only after user confirms" into pi-dev
...
am: fcac34d723
2018-05-30 10:41:35 -07:00
Fan Zhang
74ba1a51d7
Skip device index job if caller is not Settings app.
...
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Test: robotests
2018-05-30 10:38:58 -07:00
TreeHugger Robot
fcac34d723
Merge "Give PBAP permission only after user confirms" into pi-dev
2018-05-30 17:35:57 +00:00
Fan Zhang
09df7d7071
[automerger skipped] Merge "Plumb context object to PowerWhitelistBackend." into pi-dev am: cf2e1fd593
...
am: 4a337db847
2018-05-29 20:45:22 -07:00
Fan Zhang
4a337db847
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
...
am: cf2e1fd593
2018-05-29 20:20:55 -07:00
TreeHugger Robot
cf2e1fd593
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
2018-05-30 03:08:20 +00:00
Fan Zhang
70af6d884c
[automerger skipped] Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev am: ce7d1ab3bb
...
am: 85d843f72d
2018-05-29 19:07:20 -07:00
TreeHugger Robot
6e06da361a
Merge "Plumb context object to PowerWhitelistBackend."
2018-05-30 01:50:40 +00:00
Fan Zhang
85d843f72d
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
...
am: ce7d1ab3bb
2018-05-29 18:01:02 -07:00
TreeHugger Robot
3a05544d34
Merge "Misc fixes for Settings"
2018-05-30 00:26:48 +00:00
TreeHugger Robot
ce7d1ab3bb
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
2018-05-30 00:18:45 +00:00
Fan Zhang
3489f65024
Plumb context object to PowerWhitelistBackend.
...
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:33:01 +00:00
Fan Zhang
7e395e1a00
Plumb context object to PowerWhitelistBackend.
...
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
2018-05-29 22:32:22 +00:00
Fan Zhang
9ab2f37226
Prevent disabling default phone/sms apps in battery setting
...
- In handleDisableable(), call getKeepEnabledPackages() in the same way
as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
app packages.
Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:25:56 +00:00
Fan Zhang
b70b11e02b
Prevent disabling default phone/sms apps in battery setting
...
- In handleDisableable(), call getKeepEnabledPackages() in the same way
as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
app packages.
Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Bug: 80328396
Bug: 80312809
Test: robotests
2018-05-29 22:21:24 +00:00
