Antony Sargent
732b65ca4d
Merge translations of Bluetooth confirmation text
...
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
2018-05-21 15:14:25 -07: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
Android Build Merger (Role)
108cb3edaa
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
...
Change-Id: I8bb2f283f86210447788c3191b67c1936e7b0a72
2018-05-21 22:05:41 +00: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
Antony Sargent
a0b8f3fe3a
Merge translations of Bluetooth confirmation text
...
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug: 62672248
Test: manual
Change-Id: I049138002f07e78442ddebfa746d6128b5689947
2018-05-21 14:43:18 -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
Android Build Merger (Role)
81573c9301
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
skipped: ed423eadcf
skipped: 7304aaf293
skipped: e9345782e2
skipped: c874b450af
...
Change-Id: I9d42278f5f9dae38dacf16012b242c6dd9b5abb2
2018-05-21 21:00:05 +00:00
Android Build Merger (Role)
c874b450af
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
skipped: ed423eadcf
skipped: 7304aaf293
skipped: e9345782e2
...
Change-Id: Iacafdefee68a900d636db83ccbf764114327a805
2018-05-21 21:00:04 +00:00
Android Build Merger (Role)
e9345782e2
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
skipped: ed423eadcf
skipped: 7304aaf293
...
Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e
2018-05-21 21:00:03 +00:00
Android Build Merger (Role)
7304aaf293
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
skipped: ed423eadcf
...
Change-Id: I1fa52208a183a67c694c9457bb304f94c1a05ec1
2018-05-21 21:00:01 +00:00
Android Build Merger (Role)
ed423eadcf
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
...
Change-Id: Ic63f7f831df3111a5ce1cda7759e760563ea574d
2018-05-21 20:59:52 +00: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
android-build-team Robot
80ae767de1
Snap for 4793706 from 36029724b2
to pi-release
...
Change-Id: I175980e222db0bf6b78a273caf191fadc0a19eb3
2018-05-21 07:21:15 +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
android-build-team Robot
b6af72e2ca
Snap for 4793185 from c96606500f
to pi-release
...
Change-Id: I0a96977ee310814f0b5a3036a08162b71cc8ea39
2018-05-20 07:22:22 +00: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
TreeHugger Robot
0e721c598e
Merge "Make user explicitly set security type for tether network" into pi-dev
2018-05-19 03:17:17 +00:00
Salvador Martinez
d9bae5a15e
Make user explicitly set security type for tether network
...
This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.
Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
2018-05-19 02:14:18 +00:00
Lei Yu
0e0bf4672b
Merge "Refine update process for restrict tip." into pi-dev
...
am: 018548b320
Change-Id: I947eac4e04f049dda27a306427a9bf70412527fc
2018-05-18 19:02:55 -07:00
TreeHugger Robot
018548b320
Merge "Refine update process for restrict tip." into pi-dev
2018-05-19 01:55:05 +00:00
Alexey Kuzmin
cf663511db
Add vibration preview
...
Test: Open vibration intensity settings, tap on any option. The preview
effect of selected intensity should be played back.
Bug: 74504389
Merged-In: Ie22ecb830752edb7a7515a3a6475587e72274e51
Change-Id: Ie22ecb830752edb7a7515a3a6475587e72274e51
2018-05-19 02:48:09 +01:00
Shuzhen Wang
94f80c719a
Merge "Settings: Add logical camera default switch" into pi-dev
...
am: 871d93a564
Change-Id: Id24373caa953f31fae232eb965710cca909ce19d
2018-05-18 18:37:16 -07:00
hughchen
e5ec69e433
Merge "Add controller to show the summary" into pi-dev
...
am: 863b27270d
Change-Id: I612207108138216ba865cb026b00866ae9f53250
2018-05-18 18:35:44 -07:00
TreeHugger Robot
871d93a564
Merge "Settings: Add logical camera default switch" into pi-dev
2018-05-19 01:27:11 +00:00
TreeHugger Robot
863b27270d
Merge "Add controller to show the summary" into pi-dev
2018-05-19 01:26:12 +00:00
Antony Sargent
d789f43ea9
Merge "Update headset, help, and info icons" into pi-dev
...
am: 88d4356a1f
Change-Id: Ic8ae157f46296613edd6f0b75a43973d4a69d048
2018-05-18 18:25:46 -07:00
Antony Sargent
1ead1f1665
Merge "Refresh of "swipe up" gesture animation" into pi-dev
...
am: 5d0efdce7f
Change-Id: Ieb09a7411a7e4f81ccd9fea2f9f7b53c5ce07ebd
2018-05-18 18:24:44 -07:00
TreeHugger Robot
88d4356a1f
Merge "Update headset, help, and info icons" into pi-dev
2018-05-19 01:22:23 +00:00
TreeHugger Robot
5d0efdce7f
Merge "Refresh of "swipe up" gesture animation" into pi-dev
2018-05-19 01:20:35 +00:00
Hansong Zhang
e36ca3e96d
DO NOT MERGE Give PBAP permission only after user confirms
...
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
2018-05-18 17:31:42 -07:00
Antony Sargent
93efecbe47
Refresh of "swipe up" gesture animation
...
Fixes: 77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I3e6f187ffd79c8b39afeb783fd067878136d0feb
2018-05-18 16:09:20 -07:00
Fan Zhang
9b8684fd12
Merge "Don't use cached app icon in app info page." into pi-dev
...
am: 7312f55549
Change-Id: I3f196276bca134df35d0c723ae637354f5214744
2018-05-18 16:08:08 -07:00
Shuzhen Wang
a9578a2b8a
Settings: Add logical camera default switch
...
Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.
Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
Merged-In: I86c7f3b9830fb376b324621feb31cdfac59faee5
2018-05-18 23:01:03 +00:00
Antony Sargent
6ef7737b71
Update headset, help, and info icons
...
Bug: 77982107
Test: manual
Change-Id: Ib5fe8e4df4a524b9c50ad395cd0189bef5fcafa5
2018-05-18 15:45:01 -07:00
TreeHugger Robot
7312f55549
Merge "Don't use cached app icon in app info page." into pi-dev
2018-05-18 22:43:35 +00:00
Beverly
9c6ccfbb4a
Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev
...
am: cf845f365c
Change-Id: Ifdbe1baa8fc2b7cff4520ef61aa9277d9aeaef15
2018-05-18 15:32:12 -07:00