OSDN Git Service
Adam Lesinski [Tue, 25 Jul 2017 01:19:36 +0000 (18:19 -0700)]
Cherry-pick from master: AAPT2: Fix JavaDoc first sentence extraction.
The old algorithm for detecting the first sentence of a JavaDoc comment
looked for the first occurence of '.'. This does not work when code or a
{@link android.R.styleable} link is encountered in the first sentence.
Switch to checking for whitespace characters after the '.' character.
Bug:
62900335
Test: make aapt2_tests , make ds-docs
Original change-Id: I8238f6a6304c9c2f92e2e576ca8962a59c2b20ea
Change-Id: Ie272d0d793d157f2a30f3ead20b2b53976661d33
TreeHugger Robot [Thu, 27 Jul 2017 19:33:16 +0000 (19:33 +0000)]
Merge "Uses ParceledListSlice to allow larger number of datasets." into oc-mr1-dev
Jack He [Thu, 27 Jul 2017 19:00:03 +0000 (19:00 +0000)]
Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev
am:
3afa031888
Change-Id: I7a8f6a7fcb3a693cfdec47525f5d1384b34e7b66
TreeHugger Robot [Thu, 27 Jul 2017 18:55:22 +0000 (18:55 +0000)]
Merge "Bluetooth: show multi-device status in Quick Settings" into oc-dr1-dev
Jason Monk [Thu, 27 Jul 2017 18:54:04 +0000 (18:54 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev
am:
a5e3249b8a
Change-Id: Id4a3373bbb6006a0f31e99e74de4c810b84b3afa
TreeHugger Robot [Thu, 27 Jul 2017 18:43:39 +0000 (18:43 +0000)]
Merge "Fix QS DND Radio alignment ONCE AND FOR ALL" into oc-dr1-dev
Etan Cohen [Thu, 27 Jul 2017 18:11:36 +0000 (18:11 +0000)]
Merge "[RTT] Add a binder to the AIDL to enable cleanup" into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 18:07:19 +0000 (18:07 +0000)]
Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev
Yohei Yukawa [Thu, 27 Jul 2017 17:33:36 +0000 (17:33 +0000)]
Merge "Lock down IME switcher notification handling" into oc-mr1-dev
Adrian Roos [Thu, 27 Jul 2017 17:23:00 +0000 (17:23 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
am:
6efe486397
Change-Id: I016efc215fa8fcf66a814f7cdf25a8ae0cc13e75
Michael Wright [Thu, 27 Jul 2017 17:20:02 +0000 (17:20 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
am:
bf9b1dbb66 -s ours
Change-Id: I1bf0773df207deb55b8e4b8952919c875591e909
Michael Wright [Thu, 27 Jul 2017 17:12:53 +0000 (17:12 +0000)]
Report the display is off when the hardware blanks itself.
am:
410fd1b838 -s ours
Change-Id: I1af77c81d740876748958664fb78337d9939e136
TreeHugger Robot [Thu, 27 Jul 2017 17:05:31 +0000 (17:05 +0000)]
Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 17:03:17 +0000 (17:03 +0000)]
Merge "Report the display is off when the hardware blanks itself." into oc-dr1-dev
Lucas Dupin [Thu, 27 Jul 2017 16:49:50 +0000 (16:49 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am:
4451b6ae19
Change-Id: Ia176aeafa9c9e2d0b979a472bb444657b4417ab9
Felipe Leme [Tue, 25 Jul 2017 22:19:30 +0000 (15:19 -0700)]
Uses ParceledListSlice to allow larger number of datasets.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testAutofillLargeNumberOfDatasets
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
63669555
Change-Id: If0847da3bafa1bfd80ee8925e17aace82010aec9
Lucas Dupin [Thu, 27 Jul 2017 16:41:12 +0000 (16:41 +0000)]
Merge "Add theme variables to SysUI dump" into oc-dr1-dev
Neil Fuller [Thu, 27 Jul 2017 16:02:50 +0000 (16:02 +0000)]
Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev
Felipe Leme [Thu, 27 Jul 2017 15:11:22 +0000 (15:11 +0000)]
Merge "Don't show Save UI when values filled by user belong to a dataset." into oc-mr1-dev
Adrian Roos [Thu, 27 Jul 2017 15:05:39 +0000 (15:05 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
am:
4bb2f8e9fb
Change-Id: Ica37d75f7e45ad418113196b077fa4244512adc4
Adrian Roos [Thu, 27 Jul 2017 14:58:45 +0000 (14:58 +0000)]
Merge "AOD: Make sure to update visibilities after instant expanding" into oc-dr1-dev
Adrian Roos [Tue, 25 Jul 2017 14:29:27 +0000 (16:29 +0200)]
AOD: Make sure to update visibilities after instant expanding
Fixes an issue where disable flags were not applied properly because
they were not recomputed after expanding the PanelBar.
Change-Id: I6933ba4951bf768a15a9d4f58728558939f106ae
Fixes:
64001235
Test: Open camera, put to landscape, press power; Verify time and battery icon are not visible in transition.
TreeHugger Robot [Thu, 27 Jul 2017 14:45:53 +0000 (14:45 +0000)]
Merge changes from topic 'aod-mr1' into oc-mr1-dev
* changes:
Add new config to tell us whether brightness is bucketed or continuous
Report the display is off when the hardware blanks itself.
Beverly [Thu, 27 Jul 2017 14:36:12 +0000 (14:36 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
am:
6526347aa7
Change-Id: I747c3fba988fe1ed159f4b231a641c32de30a11e
TreeHugger Robot [Thu, 27 Jul 2017 14:27:25 +0000 (14:27 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 14:23:03 +0000 (14:23 +0000)]
Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev
Pavel Grafov [Thu, 27 Jul 2017 14:01:39 +0000 (14:01 +0000)]
Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev
Sundeep Ghuman [Thu, 27 Jul 2017 12:46:37 +0000 (12:46 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
am:
6628e48a1f
Change-Id: I42646bd34afed594e105ff55217276ead380ece5
TreeHugger Robot [Thu, 27 Jul 2017 12:40:20 +0000 (12:40 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
Neil Fuller [Wed, 26 Jul 2017 10:59:34 +0000 (11:59 +0100)]
Alter condition for starting RulesManagerService
Modify the condition used for starting RulesManagerService:
use mOnlyCore rather than disableNonCoreServices. mOnlyCore is
important for the secure lock screen and when mOnlyCore is true
the RulesManagerService cannot perform trust checks. Therefore,
disable the RulesManagerService when mOnlyCore == true.
disableNonCoreServices is apparently not used.
Bug:
64057583
Test: Boot device with time zone updates enabled and with a lock
pattern set.
Change-Id: Idd7cb6e11b1a91dfe7394f6c98f8fa3e0eec9dce
(cherry picked from commit
4fbaee8f49691a95a0cbcb75b611e281b7a00093)
Adrian Roos [Thu, 27 Jul 2017 11:57:35 +0000 (13:57 +0200)]
AOD: Fix wakeup transition jank
No longer do the upwards animation from AOD1, because there is a fade in instead now.
Also, because the DozeService gets finished when waking up, we were disallowing
animations again. Instead, we now ignore disallowing animations while waking up.
Also don't cancel the NotificationPanelView wakeup animation when another identical
request comes in.
Also adds tracing for various SystemUI states.
Bug:
63531607
Test: Wake up from AOD1. Ensure there is no jank or flicker
Change-Id: I383ffa320f28ac4bf5432e4f4f5c06372717f66f
TreeHugger Robot [Thu, 27 Jul 2017 10:10:56 +0000 (10:10 +0000)]
Merge "screencap: always exit with _exit()." into oc-mr1-dev
Jack He [Thu, 27 Jul 2017 06:51:23 +0000 (23:51 -0700)]
Bluetooth: show multi-device status in Quick Settings
* In Quick Settings, BluetoothTile used BluetoothController to track
BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED intent
that is only fired when 1st device is connecting/connected and last
device is disconnecting/disconnected. As result, non-first device's
connecting/connected states and non-last device's
disconnecting/disconnected states are not tracked properly.
* Instead, CachedBluetoothDevice.getMaxConnectionState() should be used
Bug:
63509289
Test: Connect to multiple devices and disconnect from multiple devices
Change-Id: I9ccc2d3e9e4ae1a44f4d270368a8f07030353544
Lucas Dupin [Thu, 27 Jul 2017 04:54:14 +0000 (04:54 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
am:
6462fe4b95
Change-Id: I26e59cb96c0560334dcb7501d9e13ec38dc8c9ba
Lucas Dupin [Thu, 27 Jul 2017 04:48:06 +0000 (21:48 -0700)]
Add theme variables to SysUI dump
Dumping current themes and scrim states to make debugging easier.
Bug:
63890571
Test: adb bugreport # look for new variables
Change-Id: Ia9bfd1b91d8d2c19930cb896d337ecdfa776e6cb
TreeHugger Robot [Thu, 27 Jul 2017 04:47:22 +0000 (04:47 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 04:21:31 +0000 (04:21 +0000)]
Merge "Move cursor to end of text when autofilling." into oc-mr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 04:07:03 +0000 (04:07 +0000)]
Merge "Added sliding motion / animation to Autofill Save UI." into oc-mr1-dev
Hall Liu [Thu, 27 Jul 2017 03:44:27 +0000 (03:44 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev
am:
3d1e1cc9db
Change-Id: I48385860a09dd07ef858230f0a73e5e5cb3a8df3
TreeHugger Robot [Thu, 27 Jul 2017 03:35:35 +0000 (03:35 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev
Sundeep Ghuman [Tue, 18 Jul 2017 22:16:01 +0000 (15:16 -0700)]
Do not show unreachable APs in QS Wifi Picker.
This consolidates logic between the QS Picker and the WifiSettings
Picker. Previous QS behavior would show the out of range networks with
empty wifi pies, can last up to 3 scans, and differs from behavior in
WifiSettings.
Bug: b/
62680006
Test: 1. Open the quick settings picker
2. Minimize the picker
3. Walk out of range of the networks you say listed in the picker
4. Re-open picker
5. Networks should not be shown.
Change-Id: Ic042f3e6ac41b426c343ccca288b26dcaaafa7fb
(cherry picked from commit
bcebe09c9f627b948e0ebc1024ec828b0606ea86)
Paul Crowley [Thu, 27 Jul 2017 03:07:02 +0000 (03:07 +0000)]
Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev
am:
f43054df6b
Change-Id: Idaea177d45a70135f3a3e258e413c6d3032190d6
TreeHugger Robot [Thu, 27 Jul 2017 02:58:43 +0000 (02:58 +0000)]
Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev
Selim Cinek [Thu, 27 Jul 2017 02:25:45 +0000 (02:25 +0000)]
Merge "Added haptic feedback for longpressing." into oc-dr1-dev
am:
8a3ccb11a0
Change-Id: Iabf8f8b72cd059d3c2f8b8f0767e65e1fed09a13
Selim Cinek [Thu, 27 Jul 2017 02:15:45 +0000 (02:15 +0000)]
Merge "Not reseting the last fullscreenintent time when reinflating" into oc-mr1-dev
Selim Cinek [Thu, 27 Jul 2017 02:12:27 +0000 (02:12 +0000)]
Merge "Added haptic feedback for longpressing." into oc-dr1-dev
Selim Cinek [Thu, 27 Jul 2017 02:10:13 +0000 (02:10 +0000)]
Merge "Improving the haptic notification experience" into oc-mr1-dev
Android Build Merger (Role) [Thu, 27 Jul 2017 01:10:12 +0000 (01:10 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours am:
81a1d589ba -s ours am:
27735ae948 -s ours" into oc-mr1-dev
Bill Yi [Thu, 27 Jul 2017 01:07:21 +0000 (01:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours am:
81a1d589ba -s ours
am:
27735ae948 -s ours
Change-Id: I64cf47859df27b7214ae10670df71026d88f8f2e
Android Build Merger (Role) [Thu, 27 Jul 2017 01:06:15 +0000 (01:06 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
6df138613e -s ours" into oc-mr1-dev
Bill Yi [Thu, 27 Jul 2017 01:04:14 +0000 (01:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours
am:
6df138613e -s ours
Change-Id: I65126b3aae7b78dc3af50cd548a843ee269b12c8
Android Build Merger (Role) [Thu, 27 Jul 2017 01:03:13 +0000 (01:03 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours am:
0ceb3853e8 -s ours am:
fdcb482a98 -s ours" into oc-mr1-dev
Bill Yi [Thu, 27 Jul 2017 01:01:10 +0000 (01:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours am:
0ceb3853e8 -s ours
am:
fdcb482a98 -s ours
Change-Id: I7511cc79b8565e5c51675e409226966a8ee12a6d
TreeHugger Robot [Thu, 27 Jul 2017 01:00:58 +0000 (01:00 +0000)]
Merge "Checks if mResponses is null before using it." into oc-mr1-dev
Bill Yi [Thu, 27 Jul 2017 00:58:08 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours am:
995029b529 -s ours
am:
1e8ed22be2 -s ours
Change-Id: I1590d538bffee3129a6b7a840936d9eae44b851e
Bill Yi [Thu, 27 Jul 2017 00:48:16 +0000 (00:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours am:
aec51f497c -s ours
am:
b57520aae6 -s ours
Change-Id: Id6f6b18e639fa1d21964e79dfb40705275ed34fa
Tima Vaisburd [Thu, 27 Jul 2017 00:45:21 +0000 (00:45 +0000)]
Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev
Bill Yi [Thu, 27 Jul 2017 00:34:04 +0000 (00:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours am:
18b818e2dd -s ours
am:
415ca774d7 -s ours
Change-Id: Id74d022ccc416b1c3f528f9c2a210376f05582b8
Bill Yi [Thu, 27 Jul 2017 00:16:17 +0000 (00:16 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours am:
f66ddc099a -s ours
am:
b277fa8fb9 -s ours
Change-Id: I0a24e13600bea4b3b9cdba9d06b7cbb1386e0d4c
Bill Yi [Thu, 27 Jul 2017 00:09:23 +0000 (00:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours
am:
81a1d589ba -s ours
Change-Id: If94ae1fda7b2c6c965d6a9934d69ff6471015cc9
Felipe Leme [Wed, 26 Jul 2017 22:30:50 +0000 (15:30 -0700)]
Added sliding motion / animation to Autofill Save UI.
Test: manual observation
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
63680769
Change-Id: I62122733bb0e4b09de3347b091e27e60fbc51333
Bill Yi [Thu, 27 Jul 2017 00:04:28 +0000 (00:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours
am:
e2f2fbaea1 -s ours
Change-Id: I418d14c7d7be86a26a54cdec8a17b4cf1696c856
Bill Yi [Wed, 26 Jul 2017 23:55:29 +0000 (23:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours
am:
0ceb3853e8 -s ours
Change-Id: Ib201207aeb25acd4b29f5768511d764ea5228934
Bill Yi [Wed, 26 Jul 2017 23:50:08 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours am:
6f24c015ef -s ours
am:
3c1c07a9fe -s ours
Change-Id: Ieb4d177e031103ab4d8a1fbda2402f1bf5fd5c50
Bill Yi [Wed, 26 Jul 2017 23:44:22 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours
am:
995029b529 -s ours
Change-Id: I55aad5355130ace0d3b8826620b1bf1d0470ce23
Bill Yi [Wed, 26 Jul 2017 23:43:39 +0000 (23:43 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours am:
cccb304acf -s ours" into oc-dr1-dev
am:
ab60d6b44e -s ours
Change-Id: Ibce37f648f7dca60466e8c64c928f141dd640932
Bill Yi [Wed, 26 Jul 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours
am:
aec51f497c -s ours
Change-Id: Iee66d395f034e3898ca805e4e7d6be141aec17bb
Bill Yi [Wed, 26 Jul 2017 23:37:14 +0000 (23:37 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours" into oc-dr1-dev
am:
527cd8b04d -s ours
Change-Id: I6b4285fbad58d296305cee0e6698dd6925538024
Bill Yi [Wed, 26 Jul 2017 23:33:53 +0000 (23:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours
am:
18b818e2dd -s ours
Change-Id: Id9ad618535461c7d0b60bf324d286980073ab52f
Tadashi G. Takaoka [Wed, 19 Jul 2017 05:10:24 +0000 (14:10 +0900)]
Lock down IME switcher notification handling
This CL fixes 1) broken IME switcher notification (Bug
63644555) and
2) a possible security bypass that any background application can
virtually call IMM#showInputMethodPicker() by sending an explicit intent
to the com.android.settings (Bug
64008672), and 3) wrong hint color for
the notification.
1) From Android-O, an implicit broadcast intent doesn't get delivered
to background apps [1]. So that the implicit broadcast intent of
action "android.settings.SHOW_INPUT_METHOD_PICKER" isn't always
delivered to Settings app, especially from the notification. So that
InputMethodManagerService should use an explicit broadcast intent for
a pending intent in the IME switcher notification. And it should also
implement broadcast receiver of the intent by itself and remove
InputMethodDialogReceiver from com.android.settings app [2].
2) In addition to the existing security check [3], the explict broadcast
intent mentioned in the above 1) must be locked down to the system by
using protected-broadcast [4].
[1]: https://developer.android.com/preview/features/background.html#broadcasts
[2]: Id990c66516c9b3ed7ada6891746ec0e0eecbe545 Settings app
[3]: I4f0fc21268200c64d12b31ca54416acfbf62f37b InputMethodManagerService
[4]: Ib58d2931cc8db3b88eab64352ba445be67eaec68 CTS permission2
Test: Modified InputMethodManagerService.updateSystemUiLocked() method
to show IME switcher notification, and confirmed IME picker can be
shown from notification bar.
Test: Confirmed the following command causes error.
$ adb shell am broadcast \
-a com.android.server.InputMethodManagerService.SHOW_INPUT_METHOD_PICKER
java.lang.SecurityException: Permission Denial: not allowed to send
broadcast com.android.server.InputMethodManagerService.SHOW_INPUT_METHOD_PICKER
from pid=xxxx, uid=xxxx
Fixes:
63644555
Bug:
64008672
Change-Id: Id36c8c34159bea8b72557b40bcf024d401f580b6
TreeHugger Robot [Wed, 26 Jul 2017 23:25:05 +0000 (23:25 +0000)]
Merge "resolve merge conflicts of
1e74fdb6842b to oc-mr1-dev" into oc-mr1-dev
Etan Cohen [Tue, 25 Jul 2017 21:53:49 +0000 (14:53 -0700)]
[RTT] Add a binder to the AIDL to enable cleanup
Pass a binder from the manager to the service to enable cleanup
on app death (using binder death listener).
Bug:
37443149
Test: verified using ResponderToolActivity test apk.
Change-Id: Ifb7797db812d4cb0b219e7cbd779bad323f2a4b4
Etan Cohen [Fri, 7 Jul 2017 18:25:50 +0000 (11:25 -0700)]
[P2P][AsyncChannel] Revert client registering for service death
This effectively reverts
19c4883c850c2d1628e844b48778856673d8bfe6.
The change added a binder death listener on a peer of the AsyncChannel.
Issue: as specified in the bug - this causes a memory leak in apps
using WifiP2pManager (and possibly other clients using AsyncChannel).
The issue is that a reference to the caller is now kept by the death
listener. This means that the caller object cannot be gc'd. This
impacts WifiP2pManager since it didn't have an explicit close() method.
The original reason for the change was to enable clean-up - this can
be done in an alternative mechanism by passing-in a binder from client
to service. Will be enable in a subsequent CL.
Bug:
37443149
Test: all p2p tests, memory usage with test app
Change-Id: Iff044a8cc9c2fc0bc57db4a218b80d0b12424ddd
Bill Yi [Wed, 26 Jul 2017 23:15:22 +0000 (23:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours
am:
f66ddc099a -s ours
Change-Id: If913cec6881240926b3866eccd4f2680c96bc1f7
Bill Yi [Wed, 26 Jul 2017 23:10:06 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours
am:
603a43e5c3 -s ours
Change-Id: I57e366359829001bd92fa0b77d8068cb30c18456
Bill Yi [Wed, 26 Jul 2017 23:07:26 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours
am:
9cf9d294ef -s ours
Change-Id: I559573199120374e303bfaae5d5c18660dbb369e
Felipe Leme [Tue, 25 Jul 2017 00:08:26 +0000 (17:08 -0700)]
Don't show Save UI when values filled by user belong to a dataset.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Fixes:
63068654
Change-Id: Ia9c42d57b0e7c316bfd3c0ee29816db18ac478c1
Bill Yi [Wed, 26 Jul 2017 22:56:00 +0000 (22:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
581a166ae1 -s ours
Change-Id: If1bba4f6237b39c86fc5fa998376683d78cd483e
Bill Yi [Wed, 26 Jul 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours
am:
6f24c015ef -s ours
Change-Id: Ifce7209bce43d5228d1f2e32b1fffa43daf5d793
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours
am:
8080362358 -s ours
Change-Id: I8243f6ee311cd730ace4f9bca4693ccdabfa7523
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3875d1a103 -s ours
Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d
Bill Yi [Wed, 26 Jul 2017 22:51:49 +0000 (22:51 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev
am:
70906280eb -s ours
Change-Id: If5ae8d80646e4b2c68516e1441bc3b856c204907
Android Build Merger (Role) [Wed, 26 Jul 2017 22:51:17 +0000 (22:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours am:
cccb304acf -s ours" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c2b08ca602 -s ours
Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2
Bill Yi [Wed, 26 Jul 2017 22:47:01 +0000 (22:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours
am:
cccb304acf -s ours
Change-Id: Idae3b63b7017937b16bf124eaf329be1e1824e69
Aurimas Liutikas [Wed, 26 Jul 2017 22:46:36 +0000 (22:46 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
am:
0aadeed536
Change-Id: If30f10046c9b9952964e8656d0666c081e75c55f
Bill Yi [Wed, 26 Jul 2017 22:46:32 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fb02073a66 -s ours
Change-Id: I497f27dc7f50f9914b5157a4846c05ef4091abfd
Android Build Merger (Role) [Wed, 26 Jul 2017 22:45:45 +0000 (22:45 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours am:
611a6ffe29 -s ours" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9724569903 -s ours
Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42
Bill Yi [Wed, 26 Jul 2017 22:41:01 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours
am:
611a6ffe29 -s ours
Change-Id: Ie4eb3a673eb7e7b1f531a05e2b8a420516bccb4e
Android Build Merger (Role) [Wed, 26 Jul 2017 22:40:24 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours am:
120c3e9874 -s ours" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:40:12 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
am:
cd955ca6e5 -s ours
Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b
TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:37:35 +0000 (22:37 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours
am:
120c3e9874 -s ours
Change-Id: I149d23fe5cdedb0ecb813d252277e15e75055c01
Aurimas Liutikas [Wed, 26 Jul 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Revert "Update overscroll and toast UI"" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
am:
3bcdbff889 -s ours
Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878
Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a1bde91384 -s ours
Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c
Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9bc30ce545 -s ours
Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935
Aurimas Liutikas [Wed, 26 Jul 2017 22:07:41 +0000 (22:07 +0000)]
Revert "Update overscroll and toast UI"
This change broke android.uirendering.cts.testclasses.EdgeEffectTests.
This reverts commit
6085f8a16b5f6ed6a7a7acf854ec29ff2bef45fa.
Bug:
64085792
Change-Id: I70ccebebb54dabf1ec0ee5002adca93e44104a1e
OSDN Git Service
