OSDN Git Service
Doris Ling [Thu, 9 Aug 2018 19:11:59 +0000 (12:11 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f am:
cff5200146
am:
0f0147213e -s ours
Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
Doris Ling [Thu, 9 Aug 2018 19:03:48 +0000 (12:03 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f
am:
cff5200146
Change-Id: I44df485b49098b69371d1248067e51559dcd4964
Doris Ling [Thu, 9 Aug 2018 18:58:38 +0000 (11:58 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b
am:
3672a1fe7f
Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
Android Build Merger (Role) [Fri, 3 Aug 2018 01:00:48 +0000 (01:00 +0000)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Doris Ling [Tue, 31 Jul 2018 21:04:44 +0000 (14:04 -0700)]
Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Bill Yi [Fri, 20 Jul 2018 02:35:10 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
Doris Ling [Fri, 13 Jul 2018 19:32:00 +0000 (12:32 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes:
111195268
Test: manual
Bill Yi [Wed, 11 Jul 2018 05:28:21 +0000 (22:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
TreeHugger Robot [Tue, 10 Jul 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
Salvador Martinez [Mon, 9 Jul 2018 18:52:34 +0000 (11:52 -0700)]
Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.
Test: robotests updated
Bug:
110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
TreeHugger Robot [Mon, 9 Jul 2018 17:37:19 +0000 (17:37 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
Bill Yi [Thu, 5 Jul 2018 04:09:50 +0000 (21:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug:
111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit
f14de789f4cc7d145e6011e5a5562876e25c3f31)
TreeHugger Robot [Tue, 3 Jul 2018 21:35:32 +0000 (21:35 +0000)]
Merge "Conditionally block battery percantage from search" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
Matthew Fritze [Mon, 2 Jul 2018 18:22:59 +0000 (11:22 -0700)]
Conditionally block battery percantage from search
The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.
The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.
In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.
Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.
Bug:
110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a
Bill Yi [Tue, 3 Jul 2018 01:11:20 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app
Bug:
110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
Fan Zhang [Thu, 28 Jun 2018 05:01:57 +0000 (22:01 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am:
0e1393ae8c am:
afbdbeb7d5
am:
192cc156b0 -s ours
Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7
Fan Zhang [Thu, 28 Jun 2018 04:56:41 +0000 (21:56 -0700)]
Delete obsolete activity alias for dev settings am:
0e1393ae8c
am:
afbdbeb7d5
Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2
Fan Zhang [Thu, 28 Jun 2018 04:53:33 +0000 (21:53 -0700)]
Delete obsolete activity alias for dev settings
am:
0e1393ae8c
Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4
Peiyong Lin [Fri, 22 Jun 2018 21:08:37 +0000 (21:08 +0000)]
Merge "Rename Automatic color to Adaptive color" into pi-dev
Chia-I Wu [Thu, 21 Jun 2018 16:13:42 +0000 (00:13 +0800)]
Rename Automatic color to Adaptive color
Rename the new mode (only available on 2018 devices) from Automatic to Adaptive.
Bug:
110524699
Test: manual
Change-Id: I56e87ad11a94915155cff56a6a13a9e167383e0c
Salvador Martinez [Thu, 21 Jun 2018 22:21:20 +0000 (22:21 +0000)]
Merge "Add unofficial intent for WifiTetherSettings" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 21:18:36 +0000 (21:18 +0000)]
Merge "Allow config to disable battery percent setting" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 19:26:04 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 21 Jun 2018 18:31:13 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieb6af16365681984ceafb048d338d8132df0e3bc
TreeHugger Robot [Thu, 21 Jun 2018 02:30:43 +0000 (02:30 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev
Salvador Martinez [Tue, 19 Jun 2018 17:27:30 +0000 (10:27 -0700)]
Add unofficial intent for WifiTetherSettings
This CL adds an intent that can be used to start
WifiTether Settings.
Test: SettingsGatewayTest still passes
Bug:
110235497
Bug:
80251951
Change-Id: Iac94e563a91b1f821f69f18234d8176350ae5f29
Evan Laird [Thu, 14 Jun 2018 00:13:47 +0000 (20:13 -0400)]
Allow config to disable battery percent setting
Respect config_battery_percentage_setting_available to determine whether
or not to allow showing battery percentage in the status bar.
Test: visual
Bug:
80129194
Change-Id: I23b0065ed99865a8df37c098b2f0f16d57799706
Beverly [Thu, 7 Jun 2018 14:43:32 +0000 (10:43 -0400)]
Add help uri for prevent ringing gesture
Test: build
Bug:
79270169
Change-Id: Iea5598f26649854521202363cad6ee297cef3057
(cherry picked from commit
486d1facfab222c686e03c344619aaf19280ea2a)
Salvador Martinez [Wed, 30 May 2018 00:53:02 +0000 (17:53 -0700)]
Change UI for wireless AP tether band selection
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred
Test: atest SettingsRoboTests
Bug:
80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
Ivan Chiang [Tue, 12 Jun 2018 15:27:25 +0000 (15:27 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""
This reverts commit
ca85cc9d278d19eef92d9ed37668e906522f56c2.
Reason for revert: This patch should be submitted with whole topic.
Bug:
80227045
Change-Id: I446329aa3370b64b2a943a0f970d0236258455a3
TreeHugger Robot [Tue, 12 Jun 2018 12:47:36 +0000 (12:47 +0000)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
Artem Iglikov [Tue, 12 Jun 2018 11:40:24 +0000 (11:40 +0000)]
DO NOT MERGE Revert "Fix gray out previously connected device preference issue"
This reverts commit
95abf59af43bafe4922b8cc096b10b65440419b8.
Reason for revert: Crashes settings (b/
110075201)
Bug:
110075201
Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a
TreeHugger Robot [Tue, 12 Jun 2018 07:34:15 +0000 (07:34 +0000)]
Merge "Fix gray out previously connected device preference issue" into pi-dev
Fan Zhang [Wed, 30 May 2018 16:50:52 +0000 (09:50 -0700)]
Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes:
80437512
Fixes:
109713077
Test: robotests
(cherry picked from commit
74ba1a51d74a4fb7fc2ccd62fd38087974c20020)
TreeHugger Robot [Fri, 8 Jun 2018 18:32:47 +0000 (18:32 +0000)]
Merge "Fix typo" into pi-dev
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 [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
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
Fan Zhang [Thu, 7 Jun 2018 16:45:23 +0000 (16:45 +0000)]
Delete obsolete activity alias for dev settings
This activity alias is here since android 4.x for backward
compatibility. We no longer need it, and keeping it will cause security
issue.
Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b
Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes:
92497653
Test: manual
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
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 [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 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: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
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 nyc-mr2-dev
* changes:
[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: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:37 +0000 (20:24 +0000)]
Merge changes from topic "am-
4ae6f5bc-150e-41bc-8034-
f6d754e61424" into nyc-mr2-dev
* changes:
[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:35 +0000 (20:24 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into nyc-mr2-dev
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:25 +0000 (20:24 +0000)]
Merge changes from topic "am-
882196d9-9fac-4e85-b0bf-
2018fa4b68ae" into nyc-mr2-dev
* changes:
[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 [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 05:05:33 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
Ryan Lin [Thu, 31 May 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
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: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
TreeHugger Robot [Wed, 30 May 2018 17:35:57 +0000 (17:35 +0000)]
Merge "Give PBAP permission only after user confirms" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 03:08:20 +0000 (03:08 +0000)]
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev
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