OSDN Git Service
Antony Sargent [Wed, 6 Jun 2018 21:37:36 +0000 (14:37 -0700)]
Make icon size on Printing settings match the rest of settings
The icons on this page were being displayed at 48dp because we were
using a generic Preference element, instead of the custom settings
AppPreference which we use in lots of other places in settings for
displaying app entries in a list (and has a custom layout that ends up
with 32dp icons).
Fixes:
78654919
Test: manual (go to Settings -> Connected devices -> Connection
preferences -> Printing)
Change-Id: Icf21ab6b41fc00936cd58f3342a8c5502c6dd87f
TreeHugger Robot [Wed, 6 Jun 2018 05:26:29 +0000 (05:26 +0000)]
Merge "Fix gray out previously connected device preference issue"
TreeHugger Robot [Wed, 6 Jun 2018 04:07:35 +0000 (04:07 +0000)]
Merge "Add a flashlight slice in settings."
Doris Ling [Wed, 6 Jun 2018 03:10:40 +0000 (20:10 -0700)]
[automerger skipped] Only add entry with unique package name to default browser list. am:
688d1d81cb
am:
6e6ed32a03 -s ours
Change-Id: I8218f6d0b5bccbcf3ec92d73d1c5316b59f78474
Steven Wu [Fri, 25 May 2018 00:29:34 +0000 (20:29 -0400)]
Add a flashlight slice in settings.
- It retrieves the flashlight status from Settings.Secure.
- It uses the broadcast relay to update flashlight status
without action on the slice.
Test: robotests
Change-Id: Ib4d636541f5166b8634326cce76aed5665989b76
Fixes:
74913192
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
TreeHugger Robot [Wed, 6 Jun 2018 01:28:42 +0000 (01:28 +0000)]
Merge "No-op clean up on UserSettings to make it more readable"
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
TreeHugger Robot [Wed, 6 Jun 2018 00:32:39 +0000 (00:32 +0000)]
Merge "Only add entry with unique package name to default browser list."
Fan Zhang [Tue, 5 Jun 2018 23:29:32 +0000 (16:29 -0700)]
No-op clean up on UserSettings to make it more readable
Bug:
72319180
Test: existing tests
Change-Id: Ie7a327658d1fe16055aad7e90ecffc1e56eb6657
Doris Ling [Tue, 5 Jun 2018 22:28:27 +0000 (15:28 -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: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes:
84207432
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 5 Jun 2018 18:42:17 +0000 (11:42 -0700)]
Properly suppress zen mode entry from soundsetting page.
Change-Id: If2c033232b05753f3ba52bb986dd6c85cab6e452
Fixes:
72748524
Test: robotests
Fan Zhang [Tue, 5 Jun 2018 16:17:19 +0000 (09:17 -0700)]
Suppress prevent ringer gesture parent page in search.
The full page verion of prevent ringing is still searchable.
- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.
Fixes:
72748524
Test: existing robotests for PreventRingingPreferenceController
Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
TreeHugger Robot [Tue, 5 Jun 2018 19:52:53 +0000 (19:52 +0000)]
Merge "Don't crash on null Intent in FingerprintEnrollFindSensor"
TreeHugger Robot [Tue, 5 Jun 2018 18:14:17 +0000 (18:14 +0000)]
Merge "Add null check in displayPreference"
Beverly [Tue, 5 Jun 2018 17:05:12 +0000 (13:05 -0400)]
Add null check in displayPreference
Change-Id: I3afaa3f587dc5c9989d5e520f1c8a0b33e57ec7d
Fixes:
109740402
Test: ZenModeStarredContactsPreferenceControllerTest.java
Atanas Kirilov [Tue, 5 Jun 2018 01:57:37 +0000 (18:57 -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
am:
5a996aa7fe -s ours
Change-Id: I577577163a1bc9d1ecf47f3c90e25c54b3348cbc
Atanas Kirilov [Tue, 5 Jun 2018 01:51:33 +0000 (18:51 -0700)]
Merge changes from topic "am-
fbac9b0f-ad7d-4426-aa8e-
d258fe8d9560" into oc-dev am:
9b4f5525b4 am:
dededea9f3 am:
5e66879b53 am:
128334d2c6
am:
8006c6a726
Change-Id: I6b7b04980efc8b73b9e974bcfe0dcf8b7a7d437a
Atanas Kirilov [Tue, 5 Jun 2018 01:49:11 +0000 (18:49 -0700)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into oc-dev am:
75f0072c94 am:
67892acff1 am:
463ea747f6 am:
25bd78d7e9
am:
f97fc8eb17
Change-Id: Icad7d221f2735510a3e3ae1610ba39305c0e8b07
Atanas Kirilov [Tue, 5 Jun 2018 01:40:28 +0000 (18:40 -0700)]
Merge changes from topic "am-
6c725c0d-a5b4-4cf2-92c6-
c4d99a39a459" into oc-dev am:
438cf9da52 am:
a29108a778 am:
0d59c0d23d am:
a6b728c5a3
am:
dabefd5d43
Change-Id: If4a1f9e46ea994b1c98cc9e0ffcca987e85d5ca1
Atanas Kirilov [Tue, 5 Jun 2018 01:31:55 +0000 (18:31 -0700)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into oc-dev am:
9e626734bb am:
65db9c47b9 am:
2f38890832 am:
5dfb976b21
am:
c114a65956
Change-Id: I35673a6e6bedfa2e5c0599883766db96e6561c44
Atanas Kirilov [Tue, 5 Jun 2018 01:19:38 +0000 (18:19 -0700)]
Merge changes from topic "am-
b95e3cad-9610-4d9b-96a8-
a82f585400e6" into oc-dev am:
826b14e43e am:
74d98110f3 am:
a50293f72c am:
f2a135ec5a
am:
224968eebd
Change-Id: I5f746f3ac87a3febe343667a890fb73e2b719bdd
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
Shuzhen Wang [Tue, 5 Jun 2018 00:06:26 +0000 (17:06 -0700)]
[automerger skipped] Merge "Revert "Settings: Add logical camera default switch"" into pi-dev am:
1db4027355
am:
7ed1343d0a -s ours
Change-Id: Icddc5ec3a2d031c0021d4983952569b9aecb0b23
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
TreeHugger Robot [Mon, 4 Jun 2018 23:03:30 +0000 (23:03 +0000)]
Merge "Suppress work-profile search terms when no AfW is on device"
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
Fan Zhang [Mon, 4 Jun 2018 21:27:14 +0000 (14:27 -0700)]
Suppress work-profile search terms when no AfW is on device
- Share the same set of pref controller between main UI and search
in AccountDashboardFragment.
- Update WorkSoundPreferenceController to actually do something for
updateNonIndexable() method.
- LockscreenDashboardFragment to also suppress "Work notification" header. I
think we just missed it previously.
Change-Id: Ifa6f9b2077c9810ffff33f240929f418d4a8a5aa
Fixes:
62167659
Test: robotests
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:55:49 +0000 (20:55 +0000)]
Merge "Clean up some search nonIndexableKeys."
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
Fan Zhang [Wed, 30 May 2018 23:20:47 +0000 (16:20 -0700)]
Clean up some search nonIndexableKeys.
- Make the entire gesture setting page unsearchable. This is safe
because each row in gesture setting page lead to a child page, we are
only removing duplicates.
- Make the pref controller for System -> gesture return
AVILABLE_UNSEARCHABLE so it's also suppressed.
- Suppres the parent page for adaptive brightness.
Bug:
72748524
Test: manual
Change-Id: Id7317f5f126af88b1bde8d87b8a206d9909df904
Bill Yi [Mon, 4 Jun 2018 18:26:33 +0000 (11:26 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
d9bd267146 -s ours
am:
170d5415bc -s ours
Change-Id: I5adca8586469006ca8b38f0849335d2a9325658a
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
TreeHugger Robot [Mon, 4 Jun 2018 17:35:57 +0000 (17:35 +0000)]
Merge "Revert "Settings: Add logical camera default switch""
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
TreeHugger Robot [Fri, 1 Jun 2018 22:32:11 +0000 (22:32 +0000)]
Merge "Add Wifi calling Preference slice and other cleanup"
TreeHugger Robot [Fri, 1 Jun 2018 21:28:11 +0000 (21:28 +0000)]
Merge "Add Slices for Enhanced 4G LTE"
TreeHugger Robot [Fri, 1 Jun 2018 19:06:39 +0000 (19:06 +0000)]
Merge "Removed guest user access to Tap & Pay via Search."
Bill Yi [Fri, 1 Jun 2018 18:23:28 +0000 (11:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8c56825ecd -s ours
am:
5236bf8780 -s ours
Change-Id: Ibdb9322f8935be31ef56c583bc90ab4ac5a49c39
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
Naina Nalluri [Mon, 21 May 2018 18:53:24 +0000 (11:53 -0700)]
Add Wifi calling Preference slice and other cleanup
WifiCallingPreference Slice Provider:
1. If Wifi calling is not enabled - display message to user
to enable Wifi calling
2. Else if Wifi preference is not editable - return a null
Slice
3. Else provide a slice with rows - first row giving current pref
information, followed by preference items (in each row).
wifi_only is displayed only when it is allowed to display it.
Each row with preference item has specific intent action.
WifiCallingPreference Slice BroadcastReceiver:
1. If only Wifi calling is enabled & Wifi preference is editable &
there is a change in current value modify wifi pref setting
2. And Ask to re-query the slice in one second to display
updated settings if 1 is valid or display appropriate message.
Clean-up:
1. Return null instead of non-actionable slices.
2. Use getText to get string resources.
3. Remove unnecessary extra variables.
Bug:
79548264
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I186f19be2007c2331eaf6195e70b4a9c635adf9e
Andre Garivay [Thu, 31 May 2018 00:46:12 +0000 (17:46 -0700)]
Removed guest user access to Tap & Pay via Search.
Gathered user info to verify that user is not a guest. If user is a
guest (and only a guest: other alternate users may use the feature),
they are not allowed to load the nfc_payment_settings xml file.
Change-Id: I5700b9cd4b639b031b6d464827d16f4ea4cfa03f
Fixes:
80111261
Test: Robotests
Beverly [Fri, 1 Jun 2018 14:14:15 +0000 (10:14 -0400)]
Increase char limit to 76 for Settings string
Test: n/a
Change-Id: I97ac988fc85e8e7cbde516d9d8ad2dc86dee7e80
Fixes:
80200230
TreeHugger Robot [Fri, 1 Jun 2018 12:07:30 +0000 (12:07 +0000)]
Merge "Fix null pointer in StarredContactsPrefController"
TreeHugger Robot [Fri, 1 Jun 2018 06:06:36 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Ryan Lin [Fri, 1 Jun 2018 05:41:53 +0000 (22:41 -0700)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev am:
942b07da93
am:
15eb7fe8c4
Change-Id: I515f9679afa7962fda4f2d04392007d201468070
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
Bill Yi [Fri, 1 Jun 2018 04:25:44 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I01a0990e89de81507a540cbaa6b1bd1b2de3b2f9
Auto-generated-cl: translation import
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 23:03:12 +0000 (16:03 -0700)]
Merge "No need for "and" - ListFormatter adds it" into pi-dev am:
fa01fcb2c9
am:
60d57976bc
Change-Id: I77f7aa7076786c6f3855f9b976cfa70e23f0d8a0
Matthew Fritze [Thu, 31 May 2018 22:38:17 +0000 (15:38 -0700)]
Merge "Make Settings Slider Slices one row" into pi-dev am:
4199198ec2
am:
2c7fe6f8ea
Change-Id: I0910df206d702cc348371c57da27ddf698faa6ff
Shuzhen Wang [Thu, 31 May 2018 22:29:29 +0000 (22:29 +0000)]
Revert "Settings: Add logical camera default switch"
This reverts commit
5aab8d9ee126398972dd19ba57c19aa3122090fe.
Reason for revert: This setting is for internal QC purpose only
Bug:
80007047
Change-Id: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
TreeHugger Robot [Thu, 31 May 2018 21:35:15 +0000 (21:35 +0000)]
Merge "Added keyword 'bug' to Send Device Feedback"
Beverly [Thu, 31 May 2018 14:42:38 +0000 (10:42 -0400)]
Fix null pointer in StarredContactsPrefController
Change-Id: I9b2209825b30a6cc8dfe355632201b8082572dbb
Fixes:
80084826
Test: ZenModeStarredContactsPreferenceControllerTest.java
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
Antony Sargent [Thu, 31 May 2018 19:49:46 +0000 (12:49 -0700)]
Don't crash on null Intent in FingerprintEnrollFindSensor
During a run of the setup wizard, a tester one time encountered a case
where the 'Accept Legal terms' screen followed by the Security screen
showed for a second time after already confirming the pattern in the
Security screen. The logs showed a crash in
FingerprintEnrollFindSensor.onActivityResult which could only have
happened if it was called with a requestCode of CONFIRM_REQUEST and a
resultCode of RESULT_OK, but a null Intent.
This isn't an expected flow, and AFAIK we haven't been able to reproduce
the original problem, but it seems reasonable to at least not crash in
settings, so this CL defends against that crash by just calling finish()
in this case, which means the caller who started the
FingerprintEnrollFindSensor will see the default result code of
Activity.RESULT_CANCELLED.
Bug:
80099085
Test: make -j RunSettingsRoboTests
Change-Id: I94401eabe295e4d5396cf7d324fbf1902dc45f6d
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
Josh Hou [Thu, 3 May 2018 23:21:29 +0000 (07:21 +0800)]
Add Slices for Enhanced 4G LTE
Add Slices for Enhanced 4G LTE
Enhanced 4G LTE Slice Provider:
Create slice to display appropriate message with further instructions
Enhanced 4G LTE Slice Broadcast Reciver:
1. Change the setting via ImsManager
2. Ask to requery the slice in one second to display updated settings if 1 is valid or display appropriate message
Bug:
79270171
Test: Robotests
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I48d412de94d5d9f1ad42a299691ec5cf8001c6a1
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
TreeHugger Robot [Thu, 31 May 2018 07:00:27 +0000 (07:00 +0000)]
Merge "Shown toast when BT turned on"
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
Weien Wang [Thu, 31 May 2018 04:37:05 +0000 (04:37 +0000)]
Merge "Fix the battery icon on the battery page when low battery"
hughchen [Wed, 30 May 2018 09:19:41 +0000 (17:19 +0800)]
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
TreeHugger Robot [Wed, 30 May 2018 23:53:34 +0000 (23:53 +0000)]
Merge "Add strings for multiple user footer"
OSDN Git Service
