Android Build Merger (Role)
b176eaa85e
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
...
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
2018-06-04 17:23:08 +00:00
Bill Yi
170d5415bc
[automerger skipped] Import translations. DO NOT MERGE
...
am: d9bd267146
2018-06-04 10:12:58 -07:00
Bill Yi
d9bd267146
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af
2018-06-03 14:55:40 -07:00
Bill Yi
5236bf8780
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8c56825ecd
2018-06-01 11:19:28 -07:00
Bill Yi
8c56825ecd
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
2018-05-31 22:05:33 -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
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
Chalard Jean
2583a7bffc
Use the SSID of the network in the no internet dialog
...
Bug: 77865258
Test: manual & roboelectric
Change-Id: I72f1f74bf004f30a2c38b4c3af977ff09360d1e8
2018-05-31 16:51:38 +09: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
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
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
Hansong Zhang
48aa959b14
DO NOT MERGE Give PBAP permission only after user confirms
...
am: e36ca3e96d
2018-05-30 13:23:53 -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
TreeHugger Robot
fcac34d723
Merge "Give PBAP permission only after user confirms" into pi-dev
2018-05-30 17:35:57 +00: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
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
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
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
Hansong Zhang
500c83c1bc
Give PBAP permission only after user confirms
...
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
2018-05-29 22:15:51 +00:00
Matthew Fritze
9cb3dd123d
Merge "Fix bluetooth search result no-op" into pi-dev
...
am: f14bfcbfa6
2018-05-29 12:51:39 -07:00
TreeHugger Robot
f14bfcbfa6
Merge "Fix bluetooth search result no-op" into pi-dev
2018-05-29 19:40:14 +00:00
Fan Zhang
9bc1f54268
Merge "Fix a bug where device index is not skipped correct." into pi-dev
...
am: 75b3e6f302
2018-05-29 12:06:31 -07:00
Matthew Fritze
7fcbaf4ac9
Merge "Fix DND crash from SpringboardActivity" into pi-dev
...
am: 3f790b76b0
2018-05-29 12:05:33 -07:00
Antony Sargent
8155cbc0d2
Merge "Another refresh of swipe up gesture video" into pi-dev
...
am: d87ce094cd
2018-05-29 12:04:21 -07:00
TreeHugger Robot
75b3e6f302
Merge "Fix a bug where device index is not skipped correct." into pi-dev
2018-05-29 18:48:24 +00:00
TreeHugger Robot
3f790b76b0
Merge "Fix DND crash from SpringboardActivity" into pi-dev
2018-05-29 18:47:23 +00:00
Matthew Fritze
d5fc3a95c6
Fix bluetooth search result no-op
...
Bluetooth fragment was manually setting intent information,
which meant that the result didn't fire an intent properly.
This type of regression or mistake will be caught in the fix for
b/77921040.
Change-Id: I49f87f40acbfc3f74ea2e97835f2644d443169e2
Fixes: 80317645
Test: robotests
2018-05-29 11:38:52 -07:00
TreeHugger Robot
d87ce094cd
Merge "Another refresh of swipe up gesture video" into pi-dev
2018-05-29 18:34:23 +00:00
Michael Wright
23460d03bc
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
...
am: 8c60fc69b7
2018-05-25 19:12:31 -07:00
TreeHugger Robot
8c60fc69b7
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
2018-05-26 02:03:09 +00:00
Alexey Kuzmin
6a090b46cf
Merge "Add vibration preview" into pi-dev
...
am: 1ec06d4623
2018-05-25 18:04:18 -07:00
TreeHugger Robot
1ec06d4623
Merge "Add vibration preview" into pi-dev
2018-05-26 00:58:16 +00:00
Michael Wright
5c2736823e
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
...
am: 76e0cb6678
2018-05-25 17:28:35 -07:00
TreeHugger Robot
76e0cb6678
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
2018-05-26 00:20:44 +00:00
Fan Zhang
548485336f
Fix a bug where device index is not skipped correct.
...
When checking language/build fingerprint to skip reindex, language check
was comparing Locale object and String object, so they would never be
equal, so we accidentally reindex every time.
- Switched Objects.equal to TextUtils.equal, this catches the error at
compiler level.
Bug: 80065409
Test: compile/robotest
Change-Id: I2b3c68bb1c2fd876338f42321605567d7e64d64b
2018-05-25 16:25:14 -07:00
Michael Wright
c93dfd8f48
Add michaelwr to OWNERS for haptics settings in accessibility
...
Bug: 80243632
Test: N/A
Change-Id: Id315d626af527946230affc292ed9b329efe8b5b
2018-05-25 23:38:59 +01:00
Michael Wright
3dbaac6e71
Hide haptic intensity settings for devices without enough dynamic range.
...
Despite our hope, devices prior to P18 just don't have the dynamic range
to give three distinct vibration intensity settings. Given this, only
show an on / off toggle for devices by default unless they explicitly
opt-in to multiple intensity levels.
Test: m -j RunSettingsRoboTests
Bug: 80243632
Change-Id: I14ece855cf20f9fa44b0648d28f89c0053be5c5f
2018-05-25 22:57:03 +01:00
Antony Sargent
5d5eb8bdaa
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
...
am: e4999751ab
2018-05-25 14:42:14 -07:00
TreeHugger Robot
e4999751ab
Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev
2018-05-25 21:35:23 +00:00
Matthew Fritze
a559103b1b
Fix DND crash from SpringboardActivity
...
Special case Uris need to explicitly add their intents.
This unfortunately duplicates a list of special-cased Slices,
but I have attached a bug with a plan to address this duplicity in Q.
Change-Id: I346915c32543713d33716422018d7c950cce323d
Fixes: 80065409
Test: atest SliceDeepLinkSpringBoardTest
2018-05-25 13:35:23 -07:00
Antony Sargent
24283d3076
Remove Advanced dropdown from "About phone" screen
...
All the items will appear in the list instead of hiding some under an Advanced
dropdown.
Bug: 80302533
Test: manual (Settings->System->About phone)
Change-Id: I82857ec8e027b00762c1191d9450d30dfe47016f
2018-05-25 13:05:27 -07:00
