Bill Yi
a553a09700
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a4269d21e -s ours
Change-Id: I311f91cf73c826e657061f3fdbafd6e6c9ac5fa9
2018-09-22 16:02:30 -07:00
Bill Yi
5a4269d21e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I4317549e4010bb2cf75b07ade3cb8d54ba6dc708
2018-09-22 11:38:37 -07:00
Lei Yu
6ef05a6c23
Merge "Fix incorrect API invoke for BT profiles" am: 625c1eeaa9
...
am: dbc26b576c
Change-Id: Ic6b7a4b7541310b3a635b94a799e3476cf5cc684
2018-09-21 13:20:16 -07:00
Lei Yu
dbc26b576c
Merge "Fix incorrect API invoke for BT profiles"
...
am: 625c1eeaa9
Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
2018-09-21 13:13:39 -07:00
Lei Yu
625c1eeaa9
Merge "Fix incorrect API invoke for BT profiles"
2018-09-21 19:50:45 +00:00
jackqdyulei
c7a83b2552
Fix incorrect API invoke for BT profiles
...
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()
Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes: 113625278
Test: RunSettingsRoboTests
2018-09-20 12:38:26 -07:00
Bill Yi
7c6679fac0
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1a84e070b3 -s ours
Change-Id: I7b757cb1cc4622b05a2b1b2e277f680eb7e19898
2018-09-17 14:51:52 -07:00
Bill Yi
1a84e070b3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0c4b9cded799380c969e2acf1aac3c5a785dc81f
2018-09-17 12:35:35 -07:00
Fan Zhang
88cbe51f27
Merge "Clean up: delete unused methods" am: 41f9566da8
...
am: b371dea0cb
Change-Id: I0545f7f9914337d64d8d91eb152005e4858b6869
2018-09-12 17:39:21 -07:00
Fan Zhang
b371dea0cb
Merge "Clean up: delete unused methods"
...
am: 41f9566da8
Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a
2018-09-12 17:12:54 -07:00
Fan Zhang
41f9566da8
Merge "Clean up: delete unused methods"
2018-09-12 23:46:31 +00:00
Fan Zhang
309d86f613
Merge "Changes on Settings UI for a better user experience" am: 7737b64159
...
am: 97cb71e978
Change-Id: I2862387d1cc18fb8536ed1a1e1c9441b64395977
2018-09-12 16:25:12 -07:00
Fan Zhang
97cb71e978
Merge "Changes on Settings UI for a better user experience"
...
am: 7737b64159
Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511
2018-09-12 16:13:08 -07:00
Fan Zhang
7737b64159
Merge "Changes on Settings UI for a better user experience"
2018-09-12 22:44:39 +00:00
Bill Yi
a0bfe20b35
[automerger skipped] Import translations. DO NOT MERGE
...
am: 85c82c5681 -s ours
Change-Id: I0e777523597d91407f23f1f5c1ae8f84dd27c051
2018-09-12 15:30:03 -07:00
Fan Zhang
409a5f8c98
Clean up: delete unused methods
...
Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
2018-09-12 13:08:15 -07:00
Jin Dong
c085694cc2
Changes on Settings UI for a better user experience
...
Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
- "Network settings reset"
- "Factory data reset"
- "Screen pinning"
Bug: 113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333
2018-09-12 12:26:18 -07:00
Bill Yi
85c82c5681
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6f84ca21470e0f9224b2c038b25757f70ff25c8a
2018-09-12 12:07:42 -07:00
Fan Zhang
59cd5abb96
Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb
...
am: 2e2e1e243d
Change-Id: I3614f70f71c0e0eb064331175cb51fa30ed5a5b7
2018-09-11 18:49:12 -07:00
Fan Zhang
2e2e1e243d
Merge "Fix a crash when launching app detail for bad package name"
...
am: ada1a39ffb
Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85
2018-09-11 18:28:08 -07:00
Treehugger Robot
ada1a39ffb
Merge "Fix a crash when launching app detail for bad package name"
2018-09-12 00:57:40 +00:00
Fan Zhang
13d2551156
Fix a crash when launching app detail for bad package name
...
Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes: 78779901
Test: robotests
2018-09-11 15:12:16 -07:00
Fan Zhang
8a25b25da1
[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd -s ours
...
am: 4e8e6c3e67
Change-Id: I47f5ec55e84aae55767d3032bcf04bea257c13c8
2018-09-11 13:27:34 -07:00
Fan Zhang
4e8e6c3e67
[automerger skipped] Merge "Add config to disable app tray preview in display size."
...
am: 98a1ebedcd -s ours
Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
2018-09-11 13:13:33 -07:00
Fan Zhang
98a1ebedcd
Merge "Add config to disable app tray preview in display size."
2018-09-11 16:27:57 +00:00
Fan Zhang
18eecb1e67
Add config to disable app tray preview in display size.
...
Also move some files
Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 19:01:35 -07:00
Fan Zhang
6097b78d62
[automerger skipped] Merge "DO NOT MERGE Import clean up." am: 8a2c9e79b0 -s ours
...
am: 86e0ae5b6a -s ours
Change-Id: Ie02b99cc39273c02830be231bf407f2a3065a826
2018-09-10 09:31:09 -07:00
Fan Zhang
86e0ae5b6a
[automerger skipped] Merge "DO NOT MERGE Import clean up."
...
am: 8a2c9e79b0 -s ours
Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a
2018-09-10 09:27:07 -07:00
Fan Zhang
8a2c9e79b0
Merge "DO NOT MERGE Import clean up."
2018-09-10 15:58:34 +00:00
Bill Yi
803b260bda
[automerger skipped] Import translations. DO NOT MERGE
...
am: 22360f9706 -s ours
Change-Id: I1c19e330d2c1a3d68db3ae76c501cc33f4f001ba
2018-09-08 21:21:36 -07:00
Bill Yi
22360f9706
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
2018-09-08 18:11:46 -07:00
jackqdyulei
d81c0c4c44
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61 am: c05958ecdd -s ours
...
am: 6ec0b21544 -s ours
Change-Id: I14f1f1709d94784fdb0912f1c95b625d6318b4a0
2018-09-07 10:56:57 -07:00
jackqdyulei
6ec0b21544
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61
...
am: c05958ecdd -s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
2018-09-07 10:51:10 -07:00
jackqdyulei
c05958ecdd
Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
...
am: 618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
2018-09-07 10:46:08 -07:00
jackqdyulei
618b808b61
Update PBAP info for all pairing dialogs. DO NOT MERGE
...
am: ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
2018-09-07 10:42:16 -07:00
Dan Willemsen
831768fffe
Fix imports on pi-dev-plus-aosp to fix build
...
Change-Id: Ifa467eef0f9264348d657ceb8372990313b42fed
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-09-06 21:13:57 -07:00
Fan Zhang
d735f982d2
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
...
am: f81ec88024
Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
2018-09-06 18:33:30 -07:00
TreeHugger Robot
f81ec88024
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
2018-09-07 01:05:45 +00:00
jackqdyulei
ff171eff8e
Update PBAP info for all pairing dialogs. DO NOT MERGE
...
This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a55 )
2018-09-06 16:35:58 -07:00
Fan Zhang
f5ccd33567
Move safety & regulatory manual closer to legal settings
...
Bug: 113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
2018-09-06 22:50:32 +00:00
jackqdyulei
04e48eae76
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
...
am: 205479c25d
Change-Id: Ib1ae9f0af0cabdc26dc883f58dbc28b37ce54e42
2018-09-06 13:14:18 -07:00
TreeHugger Robot
205479c25d
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
2018-09-06 20:00:37 +00:00
Fan Zhang
de117046ad
DO NOT MERGE Import clean up.
...
Reordered all imports according to Android codestyle.
Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
tiansiming [田思明]
792ed7ffaf
Merge "Update string for message of DirectBootWarnDialog" am: b0cc3a6c7d
...
am: 662e59e628
Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
2018-09-04 13:05:10 -07:00
tiansiming [田思明]
662e59e628
Merge "Update string for message of DirectBootWarnDialog"
...
am: b0cc3a6c7d
Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
2018-09-04 12:55:11 -07:00
Treehugger Robot
b0cc3a6c7d
Merge "Update string for message of DirectBootWarnDialog"
2018-09-04 19:46:18 +00:00
tiansiming [田思明]
e8dfb36df2
Update string for message of DirectBootWarnDialog
...
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.
Bug: https://partnerissuetracker.corp.google.com/u/0/issues/72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.
Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com >
2018-09-04 17:02:07 +00:00
Bill Yi
05cd61956a
[automerger skipped] Import translations. DO NOT MERGE
...
am: 94fdfc4a44 -s ours
Change-Id: I5e27882dde15352c8121ed35eb72114f33ff8d53
2018-08-31 08:56:23 -07:00
Bill Yi
94fdfc4a44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
2018-08-30 19:02:59 -07:00
Youming Ye
05281b8d4b
Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd
...
am: 7c4b70c6e5
Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b
2018-08-30 15:47:05 -07:00