OSDN Git Service
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Treehugger Robot [Tue, 28 Aug 2018 21:29:05 +0000 (21:29 +0000)]
Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib
Bug:
76167422
Test: RunSettingsRoboTests
Remove OverlayManagerWrapper class out from Settings
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.
Bug:
76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates
- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings
The task affinity is messing with the back stack for this activity when
launched externally
Fixes:
80281932
Fixes:
80290571
Test: manual
Disable uninstall update option for secondary users.
Fixes:
110249550
Test: manual
Suppress some gesture search when there is no hardware
Fixes:
110250839
Test: robotests
Check wifi password length by byte, not char.
Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes:
79209073
Test: robotest
Treehugger Robot [Tue, 28 Aug 2018 18:03:31 +0000 (18:03 +0000)]
Merge "DO NOT MERGE Fix color_lint errors"
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE Fix color_lint errors
Test: repo upload
Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828
Treehugger Robot [Fri, 24 Aug 2018 23:58:31 +0000 (23:58 +0000)]
Merge "Fix crash in clicking Default Home gear icon."
Doris Ling [Thu, 23 Aug 2018 20:25:06 +0000 (13:25 -0700)]
Fix crash in clicking Default Home gear icon.
- change the way that default home query the resolve activity to only
check for LAUNCHER activity.
Change-Id: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Merged-In: Ib53154afe7951f4e2c7c3ab147be4c691113e0e7
Fixes:
112249115
Test: make RunSettingsRoboTests
Treehugger Robot [Thu, 23 Aug 2018 17:38:38 +0000 (17:38 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button."
Fan Zhang [Thu, 23 Aug 2018 16:25:18 +0000 (09:25 -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:
112986476
Bug:
111195268
Test: manual
Treehugger Robot [Fri, 17 Aug 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
Treehugger Robot [Thu, 16 Aug 2018 17:15:40 +0000 (17:15 +0000)]
Merge "Always show items in options menu for Wi-Fi Direct settings"
ChenChen Chen [Tue, 14 Aug 2018 06:27:25 +0000 (14:27 +0800)]
Always show items in options menu for Wi-Fi Direct settings
Remove MenuItem.SHOW_AS_ACTION_IF_ROOM flag for menu items
to avoid showing truncated texts on action bar.
Bug:
112671955
Test: Manual
Change-Id: I1c9678321442169bc86d719e820d4af68261dee1
Jordan Liu [Wed, 15 Aug 2018 21:48:01 +0000 (21:48 +0000)]
Merge "Refresh subscription info when subid changes"
Jordan Liu [Tue, 14 Aug 2018 23:52:07 +0000 (16:52 -0700)]
Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().
Fixes:
111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
Jordan Liu [Tue, 14 Aug 2018 23:54:12 +0000 (23:54 +0000)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
irisykyang [Tue, 10 Apr 2018 07:34:33 +0000 (15:34 +0800)]
Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug:
77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 18:58:25 +0000 (18:58 +0000)]
Merge "Use new SubscriptionInfo constructor"
Malcolm Chen [Thu, 9 Aug 2018 23:32:32 +0000 (16:32 -0700)]
Use new SubscriptionInfo constructor
Bug:
92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Treehugger Robot [Thu, 9 Aug 2018 21:37:17 +0000 (21:37 +0000)]
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
Jordan Liu [Wed, 8 Aug 2018 22:21:40 +0000 (22:21 +0000)]
Merge "Preserve leading 0s in mcc mnc"
Jordan Liu [Fri, 13 Jul 2018 17:43:47 +0000 (10:43 -0700)]
Preserve leading 0s in mcc mnc
Fixes:
79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Zhaoyu Su [Mon, 9 Jul 2018 06:50:47 +0000 (14:50 +0800)]
Fix ACTION_NFC_SETTINGS doesn't show connection preference
NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.
Test: send intent with action "android.settings.NFC_SETTINGS"
Bug:
111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
Xin Li [Tue, 7 Aug 2018 16:51:28 +0000 (16:51 +0000)]
Merge "Merge Android Pie into master"
Xin Li [Mon, 6 Aug 2018 23:51:22 +0000 (16:51 -0700)]
Merge Android Pie into master
Bug:
112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
Bill Yi [Sat, 4 Aug 2018 14:43:29 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
Dario Freni [Tue, 24 Jul 2018 10:58:08 +0000 (03:58 -0700)]
[automerger skipped] Merge "Include NOTICE file in /product partition."
am:
aa2ec5f239 -s ours
Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
Treehugger Robot [Tue, 24 Jul 2018 10:35:44 +0000 (10:35 +0000)]
Merge "Include NOTICE file in /product partition."
Chalard Jean [Fri, 20 Jul 2018 19:25:39 +0000 (12:25 -0700)]
Merge "Use the SSID of the network in the no internet dialog"
am:
692f989b98
Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
Treehugger Robot [Fri, 20 Jul 2018 18:57:09 +0000 (18:57 +0000)]
Merge "Use the SSID of the network in the no internet dialog"
Brad Ebinger [Mon, 16 Jul 2018 20:32:55 +0000 (13:32 -0700)]
Merge "IMS: Use the slot based ImsManager factory reset API."
am:
9e4ff6fca6
Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
Brad Ebinger [Mon, 16 Jul 2018 19:57:31 +0000 (19:57 +0000)]
Merge "IMS: Use the slot based ImsManager factory reset API."
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
(cherry picked from commit
02c5f3c7acb1fd6a33168fc299411eb46bf42685)
xiamin [Wed, 11 Jul 2018 21:51:09 +0000 (14:51 -0700)]
Merge "new password shouldn't be empty string"
am:
dd7bd6b15a
Change-Id: I8e3fb81aba487df22573b6fa67a36e2973c9a54b
Treehugger Robot [Wed, 11 Jul 2018 20:23:29 +0000 (20:23 +0000)]
Merge "new password shouldn't be empty string"
Dario Freni [Wed, 11 Jul 2018 09:52:53 +0000 (10:52 +0100)]
Include NOTICE file in /product partition.
Test: flashed on a device with /product partition and verified licences
are correctly loaded
Bug:
111179267
Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4
Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381
xiamin [Tue, 10 Jul 2018 02:48:56 +0000 (10:48 +0800)]
new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.
Bug: https://partnerissuetracker.corp.google.com/u/2/issues/
111261338
Test: empty string can not be set as a password
Signed-off-by: xiamin <xiamin@xiaomi.com>
Hemant Gupta [Tue, 19 Jun 2018 09:31:47 +0000 (15:01 +0530)]
Bluetooth: PBAP not disconnected on disabling contact sharing
Precondition: Contact Sharing is checked and there is PBAP Connection.
Usecase:
1) Establish PBAP Connection.
2) Disable "Contact Sharing" button.
3) Check if PBAP is Disconnected or not.
Issue:
PBAP Profile Disconnection is not triggered.
Root Cause:
Change in Setting menu UI by removal of "Disable Profile"
dialog box (like Android O) has resulted in not invoking
PBAP Disconnect call from Setting App.
Fix:
Handle Disconnection for PBAP from API disableProfile() at
settings/bluetooth/BluetoothDetailsProfilesController.java
like other profiles.
Test: Issue is not seen as per above usecase.
Bug:
110515410
Change-Id: Ibd18fb836e10e79e99e6b04127ae181134201cef
Daichi Ueura [Tue, 19 Jun 2018 22:36:47 +0000 (15:36 -0700)]
Merge "Show Wifi 'Off' status properly just after boot"
am:
23482a54bb
Change-Id: Icc111b50f52f5ed801d63bedfac851ba5dcc99c1
Treehugger Robot [Tue, 19 Jun 2018 21:55:17 +0000 (21:55 +0000)]
Merge "Show Wifi 'Off' status properly just after boot"
Daichi Ueura [Tue, 19 Jun 2018 06:44:21 +0000 (15:44 +0900)]
Show Wifi 'Off' status properly just after boot
If Wifi is not enabled at boot, WIFI_STATE_CHANGED_ACTION
sticky intent is not present. This results in Wifi 'Off'
status is not shown. This patch handles such case by calling
notifyChangeIfNeeded at register to refresh status.
Bug:
110373099
Test: manual - Check status after device boot with wifi off
Change-Id: I009386b03ef3269b00ce403b86087664b295f397
Pengquan Meng [Wed, 13 Jun 2018 22:33:56 +0000 (15:33 -0700)]
Merge "Remove internal ApnSetting."
am:
4079677883
Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge "Remove internal ApnSetting."
yuemingw [Wed, 13 Jun 2018 12:33:59 +0000 (13:33 +0100)]
Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug:
77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
Xin Li [Fri, 8 Jun 2018 18:08:02 +0000 (11:08 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: Ibb6c6e3f775ee19127711fcc10b2e00a2289a026
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
OSDN Git Service
