OSDN Git Service
Beverly [Fri, 8 Jun 2018 18:42:11 +0000 (11:42 -0700)]
Merge "Fix typo" into pi-dev
am:
29eec443e0
Change-Id: I3fc887ca87b96b93989e187abf05b66201d29b95
TreeHugger Robot [Fri, 8 Jun 2018 18:32:47 +0000 (18:32 +0000)]
Merge "Fix typo" into pi-dev
ryanywlin [Fri, 8 Jun 2018 18:10:56 +0000 (11:10 -0700)]
2nd attempt handle BT is not supported on emulator
am:
59287d40d1
Change-Id: I843fc58484df106af09cae87dcb886ea49aa53ea
Beverly [Fri, 8 Jun 2018 14:44:05 +0000 (10:44 -0400)]
Fix typo
Test: manual
Bug:
109925028
Change-Id: I87ec517249567123df1a8eace17109ed7e0bae2b
ryanywlin [Fri, 8 Jun 2018 06:36:34 +0000 (14:36 +0800)]
2nd attempt handle BT is not supported on emulator
Error handle before using LocalBluetoothManager in the onStart
and onStop
Bug:
80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I47f7d3b7cddc2fbbafb8fb5cf0fb6adb2d0d2d55
Fan Zhang [Fri, 8 Jun 2018 01:14:01 +0000 (18:14 -0700)]
Fix context leak in AudioSwitchPreferenceController.
am:
ee96c3a259
Change-Id: I3575074241ee60d573563edbffa214f0d705bea3
Fan Zhang [Thu, 7 Jun 2018 18:51:09 +0000 (11:51 -0700)]
Fix context leak in AudioSwitchPreferenceController.
In this controller the context is stored into a global singleton but was
not cleared, thus leaking context and associated views.
Change-Id: I4247f8ff753bc0a331c6c81a0e4b5b4bc41588de
Fixes:
80507279
Test: robotests
Test: inspected hprof before/after change
Joe Onorato [Thu, 7 Jun 2018 17:07:51 +0000 (10:07 -0700)]
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
am:
32d9f451f9
Change-Id: Ib66379c8c5a5dbae415aecc701ebb0a66859b7d5
TreeHugger Robot [Thu, 7 Jun 2018 16:48:51 +0000 (16:48 +0000)]
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev
Nathan Harold [Thu, 7 Jun 2018 02:19:44 +0000 (19:19 -0700)]
[RadioInfo] Save PreferredNetworkMode to Settings
am:
daea8be9ab
Change-Id: I801ae6b29a4cfe1286c4f032662191154dc911fb
Beverly [Thu, 7 Jun 2018 01:34:25 +0000 (18:34 -0700)]
Merge "If zen settings are updated, don't show onboarding" into pi-dev
am:
aaac61eb5e
Change-Id: I96929a31ab8f644f83db74ce12b201bd0852c782
Bill Yi [Thu, 7 Jun 2018 00:30:01 +0000 (17:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a1be4c0829 -s ours
Change-Id: I70453eadb2cf9f4f4130fb68d5ce6f03cc018c3a
Nathan Harold [Tue, 5 Jun 2018 21:02:35 +0000 (14:02 -0700)]
[RadioInfo] Save PreferredNetworkMode to Settings
Historically, the debug menu intentionally did not
save the preferred network mode once chosen. This
causes problems because some settings cause a phone
switch which overrides the preferred network mode,
which can cause another phone switch and again
override the preferred network mode, completely
obliterating the requested debug setting. This change
will now save the debug menu setting to the system
settings, which will prevent the circular changes and
loss of setting due to phone switching.
However, caching the debug setting to prevent the phone
switch logic from overriding the setting has a side
effect, which is why it wasn't done historically.
If a debug setting of the preferred network mode
is set, it will cause the UX of the non-debug network
preference screen to change. Thus, someone who uses
the debug menu to make changes must be careful to
re-set the setting to return to the correct UX of the
publicly displayed menu.
Bug:
95133265
Test: -manually set preferred network mode using the
RadioInfo menu and observed that there is no
phone switch when setting CDMA.
-confirmed that changing the network mode in
RadioInfo will cause UX changes to the public
network preference menu.
Change-Id: I91f669956a6d02515530855c4617cd0a767d73fa
Evan Rosky [Thu, 7 Jun 2018 00:24:22 +0000 (17:24 -0700)]
Request Focus in fingerprint rename dialog
am:
7a1d52eb06
Change-Id: I5add9d81a0e6814e5664fc25a3309acda29361b5
Joe Onorato [Tue, 22 May 2018 20:37:30 +0000 (13:37 -0700)]
Add comments and additional constants for the known bad anomaly types.
They aren't being used now, but by declaring them now we can consolidate
what we are encouraging OEMs to do in the PI timeframe.
Bug:
78013987
Test: treehugger
Change-Id: I7f86491448e799081b18d71274d2629a902d4972
TreeHugger Robot [Wed, 6 Jun 2018 21:40:43 +0000 (21:40 +0000)]
Merge "If zen settings are updated, don't show onboarding" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 21:38:42 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Beverly [Wed, 6 Jun 2018 15:00:09 +0000 (11:00 -0400)]
If zen settings are updated, don't show onboarding
Change-Id: I33c328e5d90f1b948c7dacb2e7f6265a1e496d35
Fixes:
109668117
Test: ZenOnboardingActivity
(cherry picked from commit
da412f07e5a8833dc96f820ac13c44bb70114ac6)
Bill Yi [Wed, 6 Jun 2018 20:20:03 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8cc9d67a4676ed8db1d8c48a76478efc715375fb
Evan Rosky [Wed, 6 Jun 2018 19:52:05 +0000 (12:52 -0700)]
Request Focus in fingerprint rename dialog
Bug:
68841055
Test: Manual. dialog comes up with focused entry
Change-Id: I5bb1b7227c1323595bf7f483e11e87e2c3550093
Doris Ling [Wed, 6 Jun 2018 02:42:15 +0000 (19:42 -0700)]
Only add entry with unique package name to default browser list.
am:
688d1d81cb
Change-Id: I36e4ececdbe333a25f2f7cba6e4a3e4e2f229b71
Doris Ling [Tue, 5 Jun 2018 20:58:48 +0000 (13:58 -0700)]
Only add entry with unique package name to default browser list.
When we query the package manager for activities that can handle the
web data uri, different capable activities within the same package will
be returned as separate entries. However, when we show the default
browser apps to the user, the entries are simply base on package name.
So, if there are multiple activities within the same package that can
handle the web data, they will be shown as duplicate entries.
When we process the resolved activities, check the corresponding package
name for duplicate entries before adding it to the default browser list.
Change-Id: I4e1f1e1ea22781efe24d791b367246423ca7a3c4
Merged-In: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes:
84207432
Test: make RunSettingsRoboTests
Atanas Kirilov [Tue, 5 Jun 2018 01:17:44 +0000 (18:17 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am:
8994d1f0a4 -s ours am:
b072779789 -s ours am:
71046c3d10 -s ours
am:
bed0aff4a2 -s ours
Change-Id: I67fcc4599901d226a6170c0c9c08ac3c0ff655bb
Atanas Kirilov [Tue, 5 Jun 2018 00:47:54 +0000 (17:47 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev am:
9b4f5525b4 am:
dededea9f3 am:
5e66879b53
am:
128334d2c6
Change-Id: If905b3299ca2e05602e2f82d3e85f20ebdddf48f
Atanas Kirilov [Tue, 5 Jun 2018 00:46:21 +0000 (17:46 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev am:
75f0072c94 am:
67892acff1 am:
463ea747f6
am:
25bd78d7e9
Change-Id: I05dc984a6c0cd5f69d4dc47e33385fa77469ae17
Atanas Kirilov [Tue, 5 Jun 2018 00:41:57 +0000 (17:41 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev am:
438cf9da52 am:
a29108a778 am:
0d59c0d23d
am:
a6b728c5a3
Change-Id: Ibfc308478a04405fb108299da7e2aaab6857c9d3
Atanas Kirilov [Tue, 5 Jun 2018 00:41:55 +0000 (17:41 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am:
8994d1f0a4 -s ours am:
b072779789 -s ours
am:
71046c3d10 -s ours
Change-Id: If9297fdc320c747d213dc81b4639e7c9f76cdedf
Atanas Kirilov [Tue, 5 Jun 2018 00:31:09 +0000 (17:31 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev am:
9e626734bb am:
65db9c47b9 am:
2f38890832
am:
5dfb976b21
Change-Id: I151b3bdedebdfdef0f6358b4a0315150521b85bf
Atanas Kirilov [Tue, 5 Jun 2018 00:18:51 +0000 (17:18 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev am:
826b14e43e am:
74d98110f3 am:
a50293f72c
am:
f2a135ec5a
Change-Id: Ifd13e7ffb4e632538aef51102b7f151777b7b626
Atanas Kirilov [Tue, 5 Jun 2018 00:10:35 +0000 (17:10 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am:
8994d1f0a4 -s ours
am:
b072779789 -s ours
Change-Id: I517819e05e5283e6c50555c713d79b34179a4f7c
Atanas Kirilov [Mon, 4 Jun 2018 23:59:14 +0000 (16:59 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
am:
8994d1f0a4 -s ours
Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81
Atanas Kirilov [Mon, 4 Jun 2018 23:46:48 +0000 (16:46 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev am:
9b4f5525b4 am:
dededea9f3
am:
5e66879b53
Change-Id: Ib02ca4cd840e86f0287c5b02f45419b894f044ea
Atanas Kirilov [Mon, 4 Jun 2018 23:45:39 +0000 (16:45 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev am:
75f0072c94 am:
67892acff1
am:
463ea747f6
Change-Id: I059ddf801b8cc60d78b209b37af37db25c049b5f
Atanas Kirilov [Mon, 4 Jun 2018 23:42:39 +0000 (16:42 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev am:
438cf9da52 am:
a29108a778
am:
0d59c0d23d
Change-Id: Ie2cfc61ddd94e49a6794bf08949b3a60f4ee98df
Atanas Kirilov [Mon, 4 Jun 2018 23:41:45 +0000 (16:41 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev am:
9e626734bb am:
65db9c47b9
am:
2f38890832
Change-Id: I9532ffd77827da2ee932e150d6f75c4022a8bba9
Atanas Kirilov [Mon, 4 Jun 2018 23:40:10 +0000 (16:40 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev am:
826b14e43e am:
74d98110f3
am:
a50293f72c
Change-Id: I20749db43dcab2085bcb9733601000cd96be14ce
Atanas Kirilov [Mon, 4 Jun 2018 23:14:11 +0000 (16:14 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev am:
9b4f5525b4
am:
dededea9f3
Change-Id: Ia42df7f876f964d153b217de4f501a0b7f03d363
Atanas Kirilov [Mon, 4 Jun 2018 23:13:02 +0000 (16:13 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev am:
75f0072c94
am:
67892acff1
Change-Id: I4ca44d469bf063ba68b078ba830a5b7f4d86a2cb
Atanas Kirilov [Mon, 4 Jun 2018 23:10:32 +0000 (16:10 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev am:
438cf9da52
am:
a29108a778
Change-Id: I24bdca64cf308155ae9499fc0db629ba31c85e90
Atanas Kirilov [Mon, 4 Jun 2018 23:09:33 +0000 (16:09 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev am:
9e626734bb
am:
65db9c47b9
Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95
Atanas Kirilov [Mon, 4 Jun 2018 23:07:36 +0000 (16:07 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev am:
826b14e43e
am:
74d98110f3
Change-Id: Ie334ee442e46dffa11926b471b0a096a3c4f1f92
Shuzhen Wang [Mon, 4 Jun 2018 23:06:07 +0000 (16:06 -0700)]
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
am:
1db4027355
Change-Id: I0d822607285c7b4405f6ef85cf06a029831e018f
Atanas Kirilov [Mon, 4 Jun 2018 22:43:14 +0000 (15:43 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev
am:
9b4f5525b4
Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7
Atanas Kirilov [Mon, 4 Jun 2018 22:41:42 +0000 (15:41 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev
am:
75f0072c94
Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c
Atanas Kirilov [Mon, 4 Jun 2018 22:39:29 +0000 (15:39 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev
am:
438cf9da52
Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794
Atanas Kirilov [Mon, 4 Jun 2018 22:38:17 +0000 (15:38 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev
am:
9e626734bb
Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe
Atanas Kirilov [Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev
am:
826b14e43e
Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8
TreeHugger Robot [Mon, 4 Jun 2018 20:45:51 +0000 (20:45 +0000)]
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:37:42 +0000 (20:37 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev
* changes:
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e am:
e20b700ac1
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2 skipped:
c874b450af
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293 skipped:
e9345782e2
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf skipped:
7304aaf293
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5 skipped:
ed423eadcf
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
7d505aefa5
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:34 +0000 (20:24 +0000)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
732b65ca4d
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b skipped:
3e48235bf6
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8 skipped:
8bc91c3b8b
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e skipped:
2d1bae1bd8
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313 skipped:
ba2ea1e53e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71 skipped:
4a82795313
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
3f8d33ff71
Merge translations of Bluetooth confirmation text
Atanas Kirilov [Mon, 4 Jun 2018 20:24:19 +0000 (20:24 +0000)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e skipped:
30d0145ead skipped:
b9aa0fbfe9
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e skipped:
30d0145ead
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f skipped:
93ee1bd17e
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f skipped:
551be9a85f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282 skipped:
874c51780f
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724 skipped:
cb66517282
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d skipped:
5b4de5e724
[automerger skipped] Merge translations of Bluetooth confirmation text skipped:
e0eeafcb5d
Merge translations of Bluetooth confirmation text
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
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
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5
Shuzhen Wang [Thu, 31 May 2018 21:12:06 +0000 (14:12 -0700)]
Revert "Settings: Add logical camera default switch"
This reverts commit
a9578a2b8a2c88d87999dafb3bcc3fae623b44ed.
Test: Build
Bug:
80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:18 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e am:
e20b700ac1
Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:16 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa am:
b176eaa85e
Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:08 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am:
a0b8f3fe3a skipped:
108cb3edaa
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
Bill Yi [Mon, 4 Jun 2018 17:12:58 +0000 (10:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d9bd267146 -s ours
Change-Id: I40fc59c193077ee76cf2e1a47e8039ef08df123f
Bill Yi [Sun, 3 Jun 2018 21:55:40 +0000 (14:55 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af
Bill Yi [Fri, 1 Jun 2018 18:19:28 +0000 (11:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8c56825ecd -s ours
Change-Id: I3a9cfd19929f45a1d551c2e09d5b7e67103a89aa
Bill Yi [Fri, 1 Jun 2018 05:05:33 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
Ryan Lin [Fri, 1 Jun 2018 00:16:12 +0000 (17:16 -0700)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
am:
942b07da93
Change-Id: I9977e19cc055effe3c9ce91a2665462957a97481
Ryan Lin [Thu, 31 May 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
Beverly [Thu, 31 May 2018 21:24:11 +0000 (14:24 -0700)]
Merge "No need for "and" - ListFormatter adds it" into pi-dev
am:
fa01fcb2c9
Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
Matthew Fritze [Thu, 31 May 2018 18:37:19 +0000 (11:37 -0700)]
Merge "Make Settings Slider Slices one row" into pi-dev
am:
4199198ec2
Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
TreeHugger Robot [Thu, 31 May 2018 18:12:00 +0000 (18:12 +0000)]
Merge "No need for "and" - ListFormatter adds it" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Make Settings Slider Slices one row" into pi-dev
Beverly [Fri, 25 May 2018 19:04:16 +0000 (15:04 -0400)]
No need for "and" - ListFormatter adds it
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes:
80303010
ryanywlin [Thu, 31 May 2018 01:37:20 +0000 (09:37 +0800)]
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
Matthew Fritze [Wed, 30 May 2018 22:39:43 +0000 (15:39 -0700)]
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
Hansong Zhang [Wed, 30 May 2018 20:59:15 +0000 (13:59 -0700)]
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d am:
48aa959b14 am:
7cc441bf2f -s ours
am:
acfbc0eff4
Change-Id: If3486b74a7b37cf12637aabeeece719c9567093a
Hansong Zhang [Wed, 30 May 2018 20:41:41 +0000 (13:41 -0700)]
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d am:
48aa959b14
am:
7cc441bf2f -s ours
Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6
Hansong Zhang [Wed, 30 May 2018 20:32:52 +0000 (13:32 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms am:
e36ca3e96d
am:
48aa959b14
Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
Hansong Zhang [Wed, 30 May 2018 20:23:53 +0000 (13:23 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
am:
e36ca3e96d
Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
Hansong Zhang [Wed, 30 May 2018 17:41:35 +0000 (10:41 -0700)]
Merge "Give PBAP permission only after user confirms" into pi-dev
am:
fcac34d723
Change-Id: I96b3a2f59ff77d646c641043428db673eaaf2653
TreeHugger Robot [Wed, 30 May 2018 17:35:57 +0000 (17:35 +0000)]
Merge "Give PBAP permission only after user confirms" into pi-dev
Fan Zhang [Wed, 30 May 2018 03:20:55 +0000 (20:20 -0700)]
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
am:
cf2e1fd593
Change-Id: I7d3b2321d9cc3c44dea3738596104df2e43cb1f3
TreeHugger Robot [Wed, 30 May 2018 03:08:20 +0000 (03:08 +0000)]
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
Fan Zhang [Wed, 30 May 2018 01:01:02 +0000 (18:01 -0700)]
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
am:
ce7d1ab3bb
Change-Id: I57a3b66ba8b4c84b7407ada5e1d754b49d85e61a
TreeHugger Robot [Wed, 30 May 2018 00:18:45 +0000 (00:18 +0000)]
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
Fan Zhang [Tue, 29 May 2018 18:14:42 +0000 (11:14 -0700)]
Plumb context object to PowerWhitelistBackend.
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes:
76435804
Test: robotests
Fan Zhang [Fri, 25 May 2018 21:59:40 +0000 (14:59 -0700)]
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
Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]
Give PBAP permission only after user confirms
Bug:
72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
Matthew Fritze [Tue, 29 May 2018 19:51:39 +0000 (12:51 -0700)]
Merge "Fix bluetooth search result no-op" into pi-dev
am:
f14bfcbfa6
Change-Id: Ie4340134a533c9dcd3293e5fc4f7d5d14fb5a3bb
TreeHugger Robot [Tue, 29 May 2018 19:40:14 +0000 (19:40 +0000)]
Merge "Fix bluetooth search result no-op" into pi-dev
Fan Zhang [Tue, 29 May 2018 19:06:31 +0000 (12:06 -0700)]
Merge "Fix a bug where device index is not skipped correct." into pi-dev
am:
75b3e6f302
Change-Id: Ifba1a52d5f9a3d3ca69a13ef769d22f0bf1402f9
Matthew Fritze [Tue, 29 May 2018 19:05:33 +0000 (12:05 -0700)]
Merge "Fix DND crash from SpringboardActivity" into pi-dev
am:
3f790b76b0
Change-Id: I310c86c8ca308e7e71d22441774bf8ce036b4ddb
Antony Sargent [Tue, 29 May 2018 19:04:21 +0000 (12:04 -0700)]
Merge "Another refresh of swipe up gesture video" into pi-dev
am:
d87ce094cd
Change-Id: Icd8df823edcd90220f8173013e019642ac5df554
TreeHugger Robot [Tue, 29 May 2018 18:48:24 +0000 (18:48 +0000)]
Merge "Fix a bug where device index is not skipped correct." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:47:23 +0000 (18:47 +0000)]
Merge "Fix DND crash from SpringboardActivity" into pi-dev
Matthew Fritze [Tue, 29 May 2018 18:38:52 +0000 (11:38 -0700)]
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
TreeHugger Robot [Tue, 29 May 2018 18:34:23 +0000 (18:34 +0000)]
Merge "Another refresh of swipe up gesture video" into pi-dev
Michael Wright [Sat, 26 May 2018 02:12:31 +0000 (19:12 -0700)]
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
am:
8c60fc69b7
Change-Id: I036caa9e233f74c71c2dddef9e58c036b250a968
TreeHugger Robot [Sat, 26 May 2018 02:03:09 +0000 (02:03 +0000)]
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev
Alexey Kuzmin [Sat, 26 May 2018 01:04:18 +0000 (18:04 -0700)]
Merge "Add vibration preview" into pi-dev
am:
1ec06d4623
Change-Id: I41ca4015889a7c0af9767d4726e852275a388d26
TreeHugger Robot [Sat, 26 May 2018 00:58:16 +0000 (00:58 +0000)]
Merge "Add vibration preview" into pi-dev
Michael Wright [Sat, 26 May 2018 00:28:35 +0000 (17:28 -0700)]
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
am:
76e0cb6678
Change-Id: I02c1b2451ad75b9a10b2e7bd83089cfd1a5c9c94
TreeHugger Robot [Sat, 26 May 2018 00:20:44 +0000 (00:20 +0000)]
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
OSDN Git Service
