OSDN Git Service
Jeff Sharkey [Mon, 23 Oct 2017 22:04:31 +0000 (16:04 -0600)]
Export AIDL for keystore Android.bp.
Test: builds, boots
Bug:
67041047
Change-Id: Iaff1de1f9c015a824ffc1f4946ced4a13d9bd7c1
TreeHugger Robot [Mon, 23 Oct 2017 15:22:49 +0000 (15:22 +0000)]
Merge "Removed .aidl files that are not used on other.aidl files."
TreeHugger Robot [Mon, 23 Oct 2017 14:09:01 +0000 (14:09 +0000)]
Merge "[Magnifier - 5] Auto invalidate and misc"
TreeHugger Robot [Mon, 23 Oct 2017 13:04:28 +0000 (13:04 +0000)]
Merge "Allow mocking package local stuff"
Charles He [Mon, 23 Oct 2017 12:41:04 +0000 (12:41 +0000)]
Merge "AM: clean up screen pinning toasts."
Jorim Jaggi [Fri, 20 Oct 2017 13:07:41 +0000 (15:07 +0200)]
Allow mocking package local stuff
Test: Tested in depending CL
Change-Id: If3a794fe6cc21b99c7b02a6af52d9d9c1027c0ae
Andrei Stingaceanu [Thu, 19 Oct 2017 16:02:22 +0000 (17:02 +0100)]
[Magnifier - 5] Auto invalidate and misc
* due to having to make the API public, drop the
invalidate_by_client strategy in favor of self invalidation
by polling
* in Magnifier#show(...) stop sending screen coordinates in favor
of view coordinates
* UI/UX:
** width from 200dp to 164dp
** fixed the shadow depth (elevation)
** fixed the rounded corners (2dp)
Bug:
63531115
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: manual test that shows the magnifier working
Change-Id: I6451767b0a618c0c4ea396ba3ee3144523dadc57
Charles He [Mon, 23 Oct 2017 10:06:23 +0000 (11:06 +0100)]
AM: clean up screen pinning toasts.
We remove the unnecessary handler thread logic in LockTaskNotify, as all
toasts are already called from the handler thread in LockTaskController.
Bug:
67934620
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Change-Id: I5019158b649b7b5f2eac4759dab817fa5f443a76
Colin Cross [Sun, 22 Oct 2017 02:28:50 +0000 (02:28 +0000)]
Merge "Use final release of ASM 6.0" am:
d5d697b023 am:
a74b04cd70 am:
baa428031a
am:
710fac6ab7
Change-Id: Ic726773fd17365d4821b63bcfc6d3d36330122a1
Colin Cross [Sun, 22 Oct 2017 02:16:44 +0000 (02:16 +0000)]
Merge "Use final release of ASM 6.0" am:
d5d697b023 am:
a74b04cd70
am:
baa428031a
Change-Id: I439fa4aa9f2fb22f372a6a76ab07676c0c51e429
Colin Cross [Sun, 22 Oct 2017 02:04:59 +0000 (02:04 +0000)]
Merge "Use final release of ASM 6.0" am:
d5d697b023
am:
a74b04cd70
Change-Id: I6bd5af249d9d1db597139207e06d002956df89a6
Colin Cross [Sun, 22 Oct 2017 01:46:39 +0000 (01:46 +0000)]
Merge "Use final release of ASM 6.0"
am:
d5d697b023
Change-Id: I94524349eaa38c020d932f301fe36f99952862bc
Colin Cross [Sun, 22 Oct 2017 01:37:11 +0000 (01:37 +0000)]
Merge "Use final release of ASM 6.0"
Etan Cohen [Sat, 21 Oct 2017 02:46:29 +0000 (02:46 +0000)]
Merge "Add Runnable mechanism to WakeupMessage" am:
5964b55654 am:
d870cd33f5 am:
b4e455552f
am:
4655548617
Change-Id: Ifb271f45a06399315f55b8fff7abd0e2a56dab8e
Etan Cohen [Sat, 21 Oct 2017 02:35:29 +0000 (02:35 +0000)]
Merge "Add Runnable mechanism to WakeupMessage" am:
5964b55654 am:
d870cd33f5
am:
b4e455552f
Change-Id: Iff399d348193b8028e3927c1003d887c211470fb
Etan Cohen [Sat, 21 Oct 2017 02:26:41 +0000 (02:26 +0000)]
Merge "Add Runnable mechanism to WakeupMessage" am:
5964b55654
am:
d870cd33f5
Change-Id: I2d0f1dd85e97764159eda8239c344e95acd41ee9
Sunny Goyal [Sat, 21 Oct 2017 02:19:53 +0000 (02:19 +0000)]
Merge "Binding to the RemoteViewsService directly from the host"
Etan Cohen [Sat, 21 Oct 2017 02:17:30 +0000 (02:17 +0000)]
Merge "Add Runnable mechanism to WakeupMessage"
am:
5964b55654
Change-Id: Iab0414f644223d69602e8e93a636eaa46137d873
Etan Cohen [Sat, 21 Oct 2017 02:04:50 +0000 (02:04 +0000)]
Merge "Add Runnable mechanism to WakeupMessage"
Jaesung Chung [Sat, 21 Oct 2017 01:32:50 +0000 (01:32 +0000)]
Merge "Make media projection permission dialog configurable"
TreeHugger Robot [Sat, 21 Oct 2017 01:21:39 +0000 (01:21 +0000)]
Merge "Changes pulled data to use Parcel objects."
TreeHugger Robot [Sat, 21 Oct 2017 00:50:28 +0000 (00:50 +0000)]
Merge "Minor improvements on Autofill:"
TreeHugger Robot [Sat, 21 Oct 2017 00:20:25 +0000 (00:20 +0000)]
Merge "Temporarily disable active task trimming."
Felipe Leme [Sat, 21 Oct 2017 00:06:09 +0000 (17:06 -0700)]
Removed .aidl files that are not used on other.aidl files.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
67867469
Change-Id: I7f598d0016d49a3956d4be00ab5acca6a62d56eb
TreeHugger Robot [Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)]
Merge "Convert skpCaptureEnabled compile time flag into a property"
Hall Liu [Fri, 20 Oct 2017 23:54:21 +0000 (23:54 +0000)]
Merge "Check success before registering DeathRecipient" am:
b6c4bc311a am:
c336947da4 am:
8e055b131a
am:
0e09d9d9d5
Change-Id: Iabe447a1f7ff3b101bc176a00a470d7776e2629c
Hall Liu [Fri, 20 Oct 2017 23:43:54 +0000 (23:43 +0000)]
Merge "Check success before registering DeathRecipient" am:
b6c4bc311a am:
c336947da4
am:
8e055b131a
Change-Id: Ic98d58505c311250fad7220bec88fcd89846b14e
Sunny Goyal [Wed, 18 Oct 2017 07:17:20 +0000 (00:17 -0700)]
Binding to the RemoteViewsService directly from the host
The host passes an IServiceConnection to the AppWidgetManager which
is used to bind to the RemoteViewsService. This allows the host to
recieve the connection callbacks directly instead of proxying it via
the AppWidgetManager. The host is also responsible for unbinding to
the service.
Bug:
26481160
Test: adb shell \
am instrument -w -e class android.widget.RemoteViewsAdapterTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iac400095a319c3a43714c82fda7516be1ccc68af
Hall Liu [Fri, 20 Oct 2017 23:32:24 +0000 (23:32 +0000)]
Merge "Check success before registering DeathRecipient" am:
b6c4bc311a
am:
c336947da4
Change-Id: Ib2b1d0919a974ebe1ce397f643454ae179c1241d
David Chen [Mon, 16 Oct 2017 20:16:34 +0000 (13:16 -0700)]
Changes pulled data to use Parcel objects.
Previously, pulled data was returned as a string. We instead
return the data as an array of StatsLogEventWrapper, which encodes
using the binary-encoded format liblog uses. StatsD uses the same
parsing as for pushed events to convert these. This CL also fixes
the parsing of log_msg since the strings were previously emptied
before we had a chance to read the values.
Note that the cpp-aidl can't support List of Parcelable, so we
have to return the results as an array.
Test: Manual using the new command in StatsService to print results.
Also created a new unit-test by creating a dummy pull code of -1,
but this test is deleted since it required creating a fake output in
StatsCompanionService.
Change-Id: I1cfb9ea081a59292a60e934e8527adc40982ed80
TreeHugger Robot [Fri, 20 Oct 2017 23:22:48 +0000 (23:22 +0000)]
Merge "incidentd: dumping batterystats app data to proto"
Max Bires [Fri, 20 Oct 2017 23:22:22 +0000 (23:22 +0000)]
Merge "Removing stats service registration in system server"
Hall Liu [Fri, 20 Oct 2017 23:22:13 +0000 (23:22 +0000)]
Merge "Check success before registering DeathRecipient"
am:
b6c4bc311a
Change-Id: Ie4a8f3ea3374d30a6a4dd9d22d9d48df0075c560
Hall Liu [Fri, 20 Oct 2017 23:10:09 +0000 (23:10 +0000)]
Merge "Check success before registering DeathRecipient"
TreeHugger Robot [Fri, 20 Oct 2017 23:10:07 +0000 (23:10 +0000)]
Merge "Perftests for StrictMode"
TreeHugger Robot [Fri, 20 Oct 2017 23:03:45 +0000 (23:03 +0000)]
Merge "Remove an extra line in a comment."
TreeHugger Robot [Fri, 20 Oct 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Let SuggestionService receive suggestion-launched signal."
TreeHugger Robot [Fri, 20 Oct 2017 22:20:57 +0000 (22:20 +0000)]
Merge "Fix crash in "Tree::updateBitmapCache""
TreeHugger Robot [Fri, 20 Oct 2017 22:18:09 +0000 (22:18 +0000)]
Merge "Reduce a11y shortcut timeout after dialog confirmation"
Charles He [Fri, 20 Oct 2017 22:09:36 +0000 (22:09 +0000)]
Merge "AM: remove toasts for LockTask mode."
Kurt Nelson [Tue, 17 Oct 2017 22:34:07 +0000 (15:34 -0700)]
Perftests for StrictMode
Add perf tests for:
* Disk read thread policy violation
* URI permission VM policy violation
* Disk read across binder thread policy violation
lunch walleye-userdebug
timeThreadViolation_mean=293735
timeThreadViolation_median=290845
timeThreadViolation_min=285718
timeThreadViolation_standardDeviation=8368
timeCrossBinderThreadViolationNoStrictMode_mean=
1327809
timeCrossBinderThreadViolationNoStrictMode_median=
1317313
timeCrossBinderThreadViolationNoStrictMode_min=
1260868
timeCrossBinderThreadViolationNoStrictMode_standardDeviation=58085
timeCrossBinderThreadViolation_mean=
2754359
timeCrossBinderThreadViolation_median=
3170103
timeCrossBinderThreadViolation_min=
1773987
timeCrossBinderThreadViolation_standardDeviation=704586
timeVmViolationNoStrictMode_mean=
10764979
timeVmViolationNoStrictMode_median=
9762317
timeVmViolationNoStrictMode_min=
5187496
timeVmViolationNoStrictMode_standardDeviation=
4099275
timeVmViolation_mean=
20003781
timeVmViolation_median=
21730129
timeVmViolation_min=
14321899
timeVmViolation_standardDeviation=
3837213
timeThreadViolationNoStrictMode_mean=237276
timeThreadViolationNoStrictMode_median=241457
timeThreadViolationNoStrictMode_min=227193
timeThreadViolationNoStrictMode_standardDeviation=8892
Bug:
65966451
Test: adb shell am instrument -w -e class android.os.StrictModeTest \
com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner
Change-Id: I97773e1060e21cf78649454973426985b33d3350
Lei Yu [Fri, 20 Oct 2017 22:00:04 +0000 (22:00 +0000)]
Merge "Add OWNERS for folder wifi"
Stan Iliev [Tue, 19 Sep 2017 16:07:10 +0000 (12:07 -0400)]
Convert skpCaptureEnabled compile time flag into a property
Convert SkiaPipeline::skpCaptureEnabled into a system property.
Add ability to capture drawing in layers. Add ability to capture
animations/sequence of frames. Fix crash when recording a
TextureView.
Test: Ran capture script.
Change-Id: I463eecf6ec90a601a6cc172ad1901bd4bcc86ac8
TreeHugger Robot [Fri, 20 Oct 2017 21:41:01 +0000 (21:41 +0000)]
Merge "Add FingerprintEnroll API"
TreeHugger Robot [Fri, 20 Oct 2017 21:12:05 +0000 (21:12 +0000)]
Merge "Easy switching of logging for TextClassifier"
Ben Schwartz [Fri, 20 Oct 2017 21:05:05 +0000 (21:05 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java" am:
3c48bd72aa am:
8138b8b3ed am:
40177a615e
am:
942e125a1a
Change-Id: I92423f3f662382308832c1b02e1bfaac1c951b7f
Winson Chung [Fri, 20 Oct 2017 20:54:39 +0000 (13:54 -0700)]
Temporarily disable active task trimming.
Bug:
68045330
Bug:
34270611
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java
Change-Id: I8c70d4f97867aca158de158d32be4b5fda1b3479
Ben Schwartz [Fri, 20 Oct 2017 20:51:57 +0000 (20:51 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java" am:
3c48bd72aa am:
8138b8b3ed
am:
40177a615e
Change-Id: Ic394eb3a058bbcc84aec2e08728e19138ad794c3
Ben Schwartz [Fri, 20 Oct 2017 20:34:45 +0000 (20:34 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java" am:
3c48bd72aa
am:
8138b8b3ed
Change-Id: I622652209613f1bd113a90d22aa924f898ce6fe2
Etan Cohen [Fri, 20 Oct 2017 04:12:34 +0000 (21:12 -0700)]
Add Runnable mechanism to WakeupMessage
The WakeupMessage object provides a mechanism to create an Alarm
which will wake-up the device and deliver a message to a Handler.
Add a Runnable mechanism as an alternative to the message.
Bug:
67276378
Test: unit test
Change-Id: Icf5f03b2b25a340273f9d3fcd09f182216ea6238
TreeHugger Robot [Fri, 20 Oct 2017 20:26:53 +0000 (20:26 +0000)]
Merge "Fix crash in Vulkan pipeline at boot time"
Ben Schwartz [Fri, 20 Oct 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java"
am:
3c48bd72aa
Change-Id: I5a4f7c33ccb0a9ddff2778726055c7c059dfa281
Treehugger Robot [Fri, 20 Oct 2017 20:14:43 +0000 (20:14 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java"
Ben Schwartz [Fri, 20 Oct 2017 17:41:12 +0000 (13:41 -0400)]
Remove @Presubmit from SettingsBackupTest.Java
It appears to be causing problems on some build bots.
Test: Problem can only be reproduced after merge...
Change-Id: I7c9c1c7a54f0e2981faecbf9793eef888f5c97d1
Tarandeep Singh [Fri, 20 Oct 2017 20:13:55 +0000 (20:13 +0000)]
Merge "Revert "SearchView focus should be preserved in split-screen.""
Android Build Merger (Role) [Fri, 20 Oct 2017 20:10:40 +0000 (20:10 +0000)]
Merge "Merge "Refactored area update info support" am:
b1092bfd55 -s ours am:
befb4f2ed4 -s ours am:
84f59db864 -s ours am:
8a9139d09e -s ours"
Jack Yu [Fri, 20 Oct 2017 20:05:26 +0000 (20:05 +0000)]
Merge "Refactored area update info support" am:
b1092bfd55 -s ours am:
befb4f2ed4 -s ours am:
84f59db864 -s ours
am:
8a9139d09e -s ours
Change-Id: I661f0301dece204b47366eb5e9faf09767698bf7
Felipe Leme [Fri, 20 Oct 2017 20:04:19 +0000 (13:04 -0700)]
Minor improvements on Autofill:
- Don't print PII on Dataset.toString()
- Use proper method to get last response
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
67867469
Change-Id: I41579ba30366e07193ab4f7790e5a107c85d6ec2
TreeHugger Robot [Fri, 20 Oct 2017 20:04:52 +0000 (20:04 +0000)]
Merge "Move StaticLayoutLineBreakingTest from coretests to CTS"
Stan Iliev [Wed, 18 Oct 2017 21:56:43 +0000 (17:56 -0400)]
Fix crash in "Tree::updateBitmapCache"
Fix crash caused by updating vectordrawable cache for objects
from previous frames, which may have been deleted.
Bug:
67940327
Test: Ran CtsUiRenderingTestCases test
Change-Id: I4466235e78e9b7937a0d4428240574d9e3d0989f
Colin Cross [Fri, 20 Oct 2017 19:57:56 +0000 (12:57 -0700)]
Use final release of ASM 6.0
Test: m checkbuild
Change-Id: I8b39c7887763a1a5efce2622421906f9b2e1994a
Jack Yu [Fri, 20 Oct 2017 19:52:13 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am:
b1092bfd55 -s ours am:
befb4f2ed4 -s ours
am:
84f59db864 -s ours
Change-Id: I89bd02a64c96fd15838eeb60488042bc758a2219
Max Bires [Fri, 20 Oct 2017 17:28:24 +0000 (10:28 -0700)]
Removing stats service registration in system server
Introduced in ag/
2837473, this stats service is not actually up and
running fully. It is creating boot time selinux denials due to lack of
permissions for system server to start the service. Since it cannot run
due to system server being unable to register it with servicemanager, the
registration code is being removed for now to clean up boot denials.
Removing this boot denial will allow boot-time presubmit tests for SELinux to be
put into place. Service definition and sepolicy for this feature can be
added when the feature is approved in the future.
Bug:
67468181
Test: servicemanager does not generate denials on boot
Change-Id: Id6a29cc6abb8ebf5a3f41da4311a555f41dd80b3
Jack Yu [Fri, 20 Oct 2017 19:40:43 +0000 (19:40 +0000)]
Merge "Refactored area update info support" am:
b1092bfd55 -s ours
am:
befb4f2ed4 -s ours
Change-Id: Ic978426f763d0c8be4381d0f836cec198153c031
Wale Ogunwale [Fri, 20 Oct 2017 19:32:01 +0000 (19:32 +0000)]
Merge "Made creation of multiple stacks more intentional."
Jack Yu [Fri, 20 Oct 2017 19:30:02 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am:
b1092bfd55 -s ours
Change-Id: Ib616989cf16ef67118145d59845c7db764dc5ee9
Adam Lesinski [Fri, 20 Oct 2017 19:19:27 +0000 (19:19 +0000)]
Merge "AssetManager2: Run ApkAssets that have failed verification"
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"
Adam Lesinski [Fri, 20 Oct 2017 19:15:54 +0000 (19:15 +0000)]
Merge changes I1a4b3ce5,Id7216e5b
* changes:
AAPT2: Enable building proto artifacts
AAPT2: Define and Implement AAPT Container Format
Android Build Merger (Role) [Fri, 20 Oct 2017 18:58:19 +0000 (18:58 +0000)]
Merge "Merge "Add link_type for temp_layoutlib" am:
d0b0e8cc86 -s ours am:
3130b4e146 -s ours am:
d857569fda -s ours am:
c2f710ed1f -s ours"
TreeHugger Robot [Fri, 20 Oct 2017 18:58:01 +0000 (18:58 +0000)]
Merge "Add OWNERS for folder bluetooth"
Dan Willemsen [Fri, 20 Oct 2017 18:56:24 +0000 (18:56 +0000)]
Merge "Add link_type for temp_layoutlib" am:
d0b0e8cc86 -s ours am:
3130b4e146 -s ours am:
d857569fda -s ours
am:
c2f710ed1f -s ours
Change-Id: I7d5ac6aff948f6ff8677e54d159eed17e0d2a9a5
Dan Willemsen [Fri, 20 Oct 2017 18:45:25 +0000 (18:45 +0000)]
Merge "Add link_type for temp_layoutlib" am:
d0b0e8cc86 -s ours am:
3130b4e146 -s ours
am:
d857569fda -s ours
Change-Id: Ide90033b38ba2d75a5fb08e3078310dda5fec9ac
Dan Willemsen [Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Add link_type for temp_layoutlib" am:
d0b0e8cc86 -s ours
am:
3130b4e146 -s ours
Change-Id: I8c22645a4148dcbc80f30b6d54ccd4926d4194c1
Dan Willemsen [Fri, 20 Oct 2017 18:27:58 +0000 (18:27 +0000)]
Merge "Add link_type for temp_layoutlib"
am:
d0b0e8cc86 -s ours
Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2
Niranjan Pendharkar [Fri, 20 Oct 2017 18:26:29 +0000 (18:26 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev am:
6575d483cc -s ours
am:
9c798025dd -s ours
Change-Id: Iac0d7d3c5d44f68d1b6de8bf45621bbd464c30da
Dan Willemsen [Fri, 20 Oct 2017 18:14:56 +0000 (18:14 +0000)]
Merge "Add link_type for temp_layoutlib"
TreeHugger Robot [Fri, 20 Oct 2017 18:08:36 +0000 (18:08 +0000)]
Merge "Update package name for ExtServices to whitelist permissions."
TreeHugger Robot [Fri, 20 Oct 2017 17:58:47 +0000 (17:58 +0000)]
Merge "AssetManager2: Improve Theme performance"
Niranjan Pendharkar [Fri, 20 Oct 2017 17:58:30 +0000 (17:58 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
am:
6575d483cc -s ours
Change-Id: I4988ab09ac45812352e8a9ef1738f1986427dc91
Tarandeep Singh [Wed, 18 Oct 2017 17:38:50 +0000 (17:38 +0000)]
Revert "SearchView focus should be preserved in split-screen."
This reverts commit
96d68d45f0be6c9589ca4509d3d6dd3b50bfa8f1.
Reason for revert: This CL fixed the bug but introduced a new one as described in bug
31298450 comment#10
Bug:
31298450
Bug:
31444175
Test: Manually done as follows
1. Open system settings.
2. Tap "System"
3. Tap "Languages & input"
4. Tap "Languages"
6. Tap "Add a language"
7. Select "English"
8. Tap the back button on the NavBar
9. Make sure that the user is navigate back to "Add a language" screen.
Change-Id: I1c98476e962a2d767ec8ed6462c50715a95be9bc
TreeHugger Robot [Fri, 20 Oct 2017 17:44:58 +0000 (17:44 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
jackqdyulei [Wed, 18 Oct 2017 22:54:47 +0000 (15:54 -0700)]
Add OWNERS for folder bluetooth
Bug:
67953936
Test: Manual
Change-Id: Ica1c919e452a0c4b62e65256b9401c105a1ed453
Android Build Merger (Role) [Fri, 20 Oct 2017 17:31:00 +0000 (17:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f9cf2df461 -s ours am:
33b0f435de -s ours am:
eed665acfd -s ours"
Bill Yi [Fri, 20 Oct 2017 17:28:39 +0000 (17:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f9cf2df461 -s ours am:
33b0f435de -s ours
am:
eed665acfd -s ours
Change-Id: Icdfc1004381d27021fd9ff5d9f257b575143f07f
Android Build Merger (Role) [Fri, 20 Oct 2017 17:26:22 +0000 (17:26 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5d9bd82bd8 -s ours am:
0c1a48ed2e -s ours am:
5993317cf8 -s ours"
Fan Zhang [Fri, 20 Oct 2017 16:30:18 +0000 (09:30 -0700)]
Let SuggestionService receive suggestion-launched signal.
This is the opposite signal to dismissSuggestion().
Bug:
65065268
Test: runtest --path core/tests/coretests/src/android/service/settings/suggestions/SuggestionServiceTest
Change-Id: Iff708fd1b06e12b6d46aefdcc658e96b44063e67
TreeHugger Robot [Fri, 20 Oct 2017 17:24:52 +0000 (17:24 +0000)]
Merge "Always update the thumbnail layer"
Bill Yi [Fri, 20 Oct 2017 17:23:49 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5d9bd82bd8 -s ours am:
0c1a48ed2e -s ours
am:
5993317cf8 -s ours
Change-Id: I19cef82e30d7bf918e22fe69c1d2fc097d23c954
Android Build Merger (Role) [Fri, 20 Oct 2017 17:18:41 +0000 (17:18 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
65fb1c889a -s ours am:
0d729e292e -s ours am:
fde55e1062 -s ours"
TreeHugger Robot [Fri, 20 Oct 2017 17:16:59 +0000 (17:16 +0000)]
Merge "FloatingToolbar updates"
Bill Yi [Fri, 20 Oct 2017 17:15:18 +0000 (17:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
65fb1c889a -s ours am:
0d729e292e -s ours
am:
fde55e1062 -s ours
Change-Id: I2eb710630bf4c1ddfc3258ee19dfe4652722d7d8
Bill Yi [Fri, 20 Oct 2017 17:11:41 +0000 (17:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
e948fe0769 -s ours am:
f6136af68f -s ours
am:
1cee40b172 -s ours
Change-Id: Ie581bd19e8d8aea5a5e9a186b1962b38ff486723
Bill Yi [Fri, 20 Oct 2017 17:03:11 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
f9cf2df461 -s ours
am:
33b0f435de -s ours
Change-Id: I9506048b61420c3bc9d353631b400200f5535e9a
Bill Yi [Fri, 20 Oct 2017 17:01:11 +0000 (17:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
6a83510d9b -s ours am:
4ad0db127e -s ours
am:
6689d34ffa -s ours
Change-Id: I04e3bfbfba63c7985928c398a2310ec650bd2d01
Bill Yi [Fri, 20 Oct 2017 16:58:15 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c0e7b25f08 -s ours am:
86141467a3 -s ours
am:
0594674ecb -s ours
Change-Id: I63e00487f82e36b20c01c66a8658109072842d40
Bill Yi [Fri, 20 Oct 2017 16:51:53 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5d9bd82bd8 -s ours
am:
0c1a48ed2e -s ours
Change-Id: I4833544baa45feb1525a4ea1260d2c0441a2c13d
Bill Yi [Fri, 20 Oct 2017 16:50:06 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
9fe4ca37b9 -s ours am:
ef30f73d5a -s ours
am:
3898a06ae0 -s ours
Change-Id: I51326d21cb637693dd7da7ef2fc4db56d9144f06
Bill Yi [Fri, 20 Oct 2017 16:48:28 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
65fb1c889a -s ours
am:
0d729e292e -s ours
Change-Id: I1d6c54f9c2ab8035115103772702e4d177a8c3b4
Bill Yi [Fri, 20 Oct 2017 16:44:48 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
e948fe0769 -s ours
am:
f6136af68f -s ours
Change-Id: I990d05d007ffc2b9a42dcb760fa9d1ffd2ab3db2