OSDN Git Service
Alan Viverette [Tue, 6 Dec 2016 02:02:07 +0000 (02:02 +0000)]
Show popup transitions when there is no anchor set am:
61edf5bbff
am:
09ce7433e9 -s ours
Change-Id: I56e2ea106d3b39dcd917e826b9bc36cfaebed62c
Alan Viverette [Tue, 6 Dec 2016 01:07:43 +0000 (01:07 +0000)]
Show popup transitions when there is no anchor set
am:
61edf5bbff
Change-Id: If658b86996fbaff411d7c487f913368715026935
Jeff Sharkey [Tue, 6 Dec 2016 00:42:18 +0000 (00:42 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33 am:
2ab7bff525 am:
48eb4e390e
am:
043c4c575c
Change-Id: I49ba073ba2c955dd3467303bdf9f7ab14eb5ba71
Jeff Sharkey [Tue, 6 Dec 2016 00:35:44 +0000 (00:35 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33 am:
2ab7bff525
am:
48eb4e390e
Change-Id: I0f8015d3ca80d1f6a806b2ff7b739ea27feddc10
Jeff Sharkey [Tue, 6 Dec 2016 00:29:38 +0000 (00:29 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33
am:
2ab7bff525
Change-Id: I80f56bc8e531fd23ffc95f2f75c84add3f9a34e5
Jeff Sharkey [Tue, 6 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge "Initial Binder interface for installd."
am:
19fc36fa33
Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0
TreeHugger Robot [Tue, 6 Dec 2016 00:22:50 +0000 (00:22 +0000)]
Merge "DozeMachine: Improve resilience against out-of-order pulse requests"
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Initial Binder interface for installd."
Adrian Roos [Mon, 5 Dec 2016 23:50:50 +0000 (23:50 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev am:
dcb6efcd55
am:
405e0fc79e
Change-Id: I83fad7d1f623d380a3444386e3c839a28f8b2cd1
Adrian Roos [Mon, 5 Dec 2016 23:49:41 +0000 (23:49 +0000)]
Lockscreen: Restrict double taps to prevent falsing am:
ac75cddcf5
am:
923e706576
Change-Id: I2492a3a86d8468a2309a0fddd1deef53876d219a
Adrian Roos [Mon, 5 Dec 2016 23:43:13 +0000 (23:43 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
am:
dcb6efcd55
Change-Id: I5e4b04c054522f7620a0a8e1b37830cf2e3711da
Adrian Roos [Mon, 5 Dec 2016 23:43:05 +0000 (23:43 +0000)]
Lockscreen: Restrict double taps to prevent falsing
am:
ac75cddcf5
Change-Id: I25fe91c23f79d8f54cfa106966dbf4a820dd4c6b
Adrian Roos [Mon, 5 Dec 2016 23:37:46 +0000 (23:37 +0000)]
Merge "Lockscreen: Restrict double taps to prevent falsing" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 23:23:49 +0000 (23:23 +0000)]
Merge "Fixed Mockito expectation."
Shunta Sato [Mon, 5 Dec 2016 22:55:23 +0000 (22:55 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev am:
53db761efb
am:
cfe760531a
Change-Id: If35c341025e858939eef8424047d2595edfaac44
Shunta Sato [Mon, 5 Dec 2016 22:54:28 +0000 (22:54 +0000)]
Avoid NPE around mReusedTask of ActivityStarter am:
9fff53f2cb
am:
2c174fb0cb
Change-Id: I441f2fe4dac673f3f2fdaa9068a1085b58c0d627
Android Build Merger (Role) [Mon, 5 Dec 2016 22:49:53 +0000 (22:49 +0000)]
Merge "Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev am:
b10e339774 am:
ff5ec7fdf6"
Christine Franks [Mon, 5 Dec 2016 22:49:02 +0000 (22:49 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev am:
b10e339774
am:
ff5ec7fdf6
Change-Id: I7e856c017c4f8b8071aa997a78dbeb9e9d81e5f7
Android Build Merger (Role) [Mon, 5 Dec 2016 22:48:38 +0000 (22:48 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates am:
cc2801296d am:
bc0bd475da"
TreeHugger Robot [Mon, 5 Dec 2016 22:48:28 +0000 (22:48 +0000)]
Merge "Add null checks for *Buffer params"
Shunta Sato [Mon, 5 Dec 2016 22:48:06 +0000 (22:48 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
am:
53db761efb
Change-Id: I33a8ef76a1a9c192889f7f66b32b383986789e04
Shunta Sato [Mon, 5 Dec 2016 22:48:00 +0000 (22:48 +0000)]
Avoid NPE around mReusedTask of ActivityStarter
am:
9fff53f2cb
Change-Id: I3e56af93c3feaf34ac93965127ad7817d609dc11
Christine Franks [Mon, 5 Dec 2016 22:47:58 +0000 (22:47 +0000)]
TwilightService: Ignore (0,0) coordinate location updates am:
cc2801296d
am:
bc0bd475da
Change-Id: I10691fe0ee6b1d788611db17a84a960fa40d3901
Christine Franks [Mon, 5 Dec 2016 22:42:51 +0000 (22:42 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
am:
b10e339774
Change-Id: Iae529fc5e891ec115379003cbb4d0236448f2f63
Christine Franks [Mon, 5 Dec 2016 22:42:45 +0000 (22:42 +0000)]
TwilightService: Ignore (0,0) coordinate location updates
am:
cc2801296d
Change-Id: Ic74955ff78956953288de96d261dc1eab8fc6137
TreeHugger Robot [Mon, 5 Dec 2016 22:41:19 +0000 (22:41 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev
Christine Franks [Mon, 5 Dec 2016 22:38:10 +0000 (22:38 +0000)]
Merge "TwilightService: Ignore (0,0) coordinate location updates" into nyc-mr2-dev
TreeHugger Robot [Mon, 5 Dec 2016 22:37:08 +0000 (22:37 +0000)]
Merge "Fix monkey NPE"
TreeHugger Robot [Mon, 5 Dec 2016 22:23:52 +0000 (22:23 +0000)]
Merge "Fixes recents from expanding full size when an app is docked"
Adrian Roos [Fri, 2 Dec 2016 17:01:09 +0000 (09:01 -0800)]
DozeMachine: Improve resilience against out-of-order pulse requests
Fixes a class of bugs that arise from requesting to pulse at
inopportune times. Also improves logging such that we know what
state transition failed to validate.
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
Change-Id: If0bbe003c4805fd180d013dadbc28addc5bb0dd4
Fixes:
32869355
TreeHugger Robot [Mon, 5 Dec 2016 21:55:05 +0000 (21:55 +0000)]
Merge "Correct the string resource for tooltip_popup_title"
Felipe Leme [Mon, 5 Dec 2016 21:41:43 +0000 (13:41 -0800)]
Fixed Mockito expectation.
Bug:
33349775
Test: most tests from NetworkPolicyManagerServiceTest passes (there are still
3 failures, but they're unrelated).
Change-Id: I291a2d8404ba540d9922e5de62f5224d2d9b9314
Xiaohui Chen [Mon, 5 Dec 2016 21:41:35 +0000 (21:41 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev am:
4eaf8c2d9b
am:
472e287812 -s ours
Change-Id: I06212be8ae14836aa6082f755ef693233bb3eb56
TreeHugger Robot [Mon, 5 Dec 2016 21:39:59 +0000 (21:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Xiaohui Chen [Mon, 5 Dec 2016 21:37:51 +0000 (21:37 +0000)]
sysui: fix navbar button view orientation am:
7917006430
am:
fe4413b214 -s ours
Change-Id: Ia7c0d2e2f64507c8d84fdab7373d26295f8483b2
Xiaohui Chen [Mon, 5 Dec 2016 21:35:15 +0000 (21:35 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
am:
4eaf8c2d9b
Change-Id: I442ff67a71fef2f9fe65c8c7f966259b6c85b495
Xiaohui Chen [Mon, 5 Dec 2016 21:31:45 +0000 (21:31 +0000)]
sysui: fix navbar button view orientation
am:
7917006430
Change-Id: I94127b0eba0f0abf47558131218dd21b5a82e089
TreeHugger Robot [Mon, 5 Dec 2016 21:21:58 +0000 (21:21 +0000)]
Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev
Jeff Sharkey [Mon, 5 Dec 2016 21:19:15 +0000 (21:19 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp am:
5e2155058d
am:
173e689099
Change-Id: I3df7c60af177c378f142514158f84c9430cf4168
Jeff Sharkey [Mon, 5 Dec 2016 21:18:02 +0000 (21:18 +0000)]
Move dump() to dumpAsync(), more oneway calls. am:
c06f184ae9
am:
a909053664 -s ours
Change-Id: Ibd2d476fc502891a2687fcae55fe7d8cdc8f43fc
TreeHugger Robot [Mon, 5 Dec 2016 21:03:01 +0000 (21:03 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 21:01:30 +0000 (21:01 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Shunta Sato [Wed, 12 Oct 2016 09:35:17 +0000 (18:35 +0900)]
Avoid NPE around mReusedTask of ActivityStarter
Symptom:
System crash by NPE is observed on ActivityStarter
during phone boot-up.
Detail and sample:
ActivityStarter has possibility to be called itself recursively
by calling TaskRecord$performClearTaskLocked().
Then class variable of mReusedTask is initialized to null
after the call, because the recursive call isn't guarded by
synchronized block.
Then NPE crash occurs on next statement.
Solutions:
Call performClearTaskLocked() before assigning
intentActivity.task to mReusedTask.
Bug:
32361138
Test: builds, boots, Manual testing of condition in bug
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com>
Change-Id: Iaea3e066a6f7134fcae4338ff864bb236241194c
(cherry picked from commit
0bd28e2c5f7fd7e4448ae489b425e4e5cee57f9a)
TreeHugger Robot [Mon, 5 Dec 2016 20:54:31 +0000 (20:54 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:52:47 +0000 (20:52 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:51:58 +0000 (20:51 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Jeff Sharkey [Mon, 5 Dec 2016 20:51:57 +0000 (20:51 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
am:
5e2155058d
Change-Id: Ia18426e76a62315071cca3a5deb6cd44578f5314
Jeff Sharkey [Mon, 5 Dec 2016 20:51:52 +0000 (20:51 +0000)]
Move dump() to dumpAsync(), more oneway calls.
am:
c06f184ae9
Change-Id: I1f060cb7e20c732e7c6da412e2e9fb7335011ec8
Matthew Ng [Mon, 5 Dec 2016 19:39:23 +0000 (11:39 -0800)]
Fixes recents from expanding full size when an app is docked
This is a bug as a result from change ag/
1635318 where the
recents/overview area expands to full size when tapped after docking an
app by dragging it to the top. As a result it would expand to full size
and show behind the docked stack.
Fixes:
33335322
Test: ./run-test android.server.cts and ran manual use case from bug
Change-Id: Icf3443631fc3f1c3407d5fd23db077e47ba81110
TreeHugger Robot [Mon, 5 Dec 2016 20:46:27 +0000 (20:46 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:44:56 +0000 (20:44 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Mon, 5 Dec 2016 20:42:39 +0000 (20:42 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:39:31 +0000 (20:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:37:23 +0000 (20:37 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:36:27 +0000 (20:36 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:33:29 +0000 (20:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
TreeHugger Robot [Mon, 5 Dec 2016 20:27:44 +0000 (20:27 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Romain Guy [Mon, 5 Dec 2016 20:26:02 +0000 (12:26 -0800)]
Add null checks for *Buffer params
This change prevents crashes in native layers and throws an exception
instead.
Bug:
25695785
Test: CtsGraphicsTestCases
Change-Id: I0b4115e001099f579f53e47fa5cb9c851c6dabdb
Phil Weaver [Mon, 5 Dec 2016 20:01:15 +0000 (20:01 +0000)]
Merge "Support continuing dispatched a11y gestures."
Vladislav Kaznacheev [Mon, 5 Dec 2016 19:44:49 +0000 (11:44 -0800)]
Correct the string resource for tooltip_popup_title
Since "tooltip" is defined as "small popup window", "Tooltip Popup"
is redundant. Replacing it with just "Tooltip".
Bug:
33257550
Test: "adb shell dumpsys window windows | grep Tooltip"
with a tooltip open, check the window title.
Change-Id: Id06e26051e4b1afcf003723d85751b51bcafa93b
Xiaohui Chen [Mon, 5 Dec 2016 19:33:05 +0000 (19:33 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev am:
33db4b77d5
am:
0443d508d1 -s ours
Change-Id: I16aab482468ddc8af33fb4b8ef8f93661c55d43c
Xiaohui Chen [Mon, 5 Dec 2016 19:31:54 +0000 (19:31 +0000)]
Fix vertical nav button direction issue am:
854bc8ea1e
am:
110dd5f426 -s ours
Change-Id: I9a6272215ee3d592e44cbe28d10e308b12960b81
Xiaohui Chen [Mon, 5 Dec 2016 19:26:01 +0000 (19:26 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
am:
33db4b77d5
Change-Id: I8222d96f03dbde0d325f5e547974161058a8f831
Xiaohui Chen [Mon, 5 Dec 2016 19:25:54 +0000 (19:25 +0000)]
Fix vertical nav button direction issue
am:
854bc8ea1e
Change-Id: Ic1a9a82c4c2c89a2c89430495b6f751b9e6ba717
Xiaohui Chen [Mon, 5 Dec 2016 19:20:16 +0000 (19:20 +0000)]
Merge "Fix vertical nav button direction issue" into nyc-mr2-dev
Christine Franks [Wed, 30 Nov 2016 17:33:07 +0000 (09:33 -0800)]
TwilightService: Ignore (0,0) coordinate location updates
Location providers may erroneously return (0.0, 0.0) when they
fail to determine the device's location. These location updates
can be safely ignored since the chance of a user actually being
at these coordinates is quite low.
Bug:
31009261
Test: added TwilightServiceTest; both tests pass
Change-Id: Ie9d7d10f81ade9b0be10f98ed74978539efaa658
Chad Brubaker [Mon, 5 Dec 2016 19:17:56 +0000 (19:17 +0000)]
Merge "Ignore permission and permission-group in ephemeral apps"
Bill Yi [Mon, 5 Dec 2016 19:03:58 +0000 (19:03 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
78eec3c16cab3ea1b2900d3cbebcb80002312169.
Change-Id: I682a6b06533dde6d59ada6d83931af0d0d617976
Jordan Liu [Mon, 5 Dec 2016 19:03:54 +0000 (19:03 +0000)]
Merge "Treat the mdn as an additional voicemail number"
Bill Yi [Mon, 5 Dec 2016 19:02:20 +0000 (19:02 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
43eacdf6c41e78c1ca5b3410129c49cbd1e4fb3f.
Change-Id: I3d1b63175df7435223b96b853ecd167b6524070e
Bill Yi [Mon, 5 Dec 2016 19:00:10 +0000 (19:00 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
d3d688a295d28ebd1ee2b849fde78ad5d7620078.
Change-Id: I70458c0379aacd83fc0d033131360178f44e2e57
Bill Yi [Mon, 5 Dec 2016 18:59:42 +0000 (18:59 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
bed5237cf397deb770031423f2ac4066a07cefbf.
Change-Id: Ic8de4454b39281c21e306bd556c59bfc41610737
Bill Yi [Mon, 5 Dec 2016 18:58:59 +0000 (18:58 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
27b4c8cc859b92046bb61b7abbd216d9be8a2762.
Change-Id: I01eb5253157cf526ea6bd145d1f6eee0ae073b35
Bill Yi [Mon, 5 Dec 2016 18:58:24 +0000 (18:58 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
09637313cd2e5b7da0d19384d76cae7f4bb93740.
Change-Id: I1060b036a4a2961d24292b489ba08b7f411fe31b
Bill Yi [Mon, 5 Dec 2016 18:57:48 +0000 (18:57 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
81f63dbeceb1f111e3d3838e0db084900820f3a3.
Change-Id: I3a82c090e9549f0eb5179d74b027a3429ad51517
Bill Yi [Mon, 5 Dec 2016 18:57:22 +0000 (18:57 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
ca0b5fd5a661627cfe814d3ff4e268486eee7058.
Change-Id: Iec420cb2e5482911062acdf973d12e8a3f2a5432
Bill Yi [Mon, 5 Dec 2016 18:56:56 +0000 (18:56 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
909eeb6572f69e563a77a0e3d7c0f2e04287325f.
Change-Id: Ib2dd031dc5d195edb1fc6675ee4c6f3597db61f9
Bill Yi [Mon, 5 Dec 2016 18:56:32 +0000 (18:56 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
b804d806e5779b45f267ef52268a8eec09f95349.
Change-Id: Ie32938ee3ebc09710da0e7ac49bcfbdcd8c3b53d
Bill Yi [Mon, 5 Dec 2016 18:56:01 +0000 (18:56 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
c124f19a763fb5879a78f42fdf8e50d34a22ac1c.
Change-Id: I92cf6f6fe770fedbf4195241881b23329a0701ed
Bill Yi [Mon, 5 Dec 2016 18:55:30 +0000 (18:55 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
c2eaccba60e23eb545870d325962ffa5fa9ffa38.
Change-Id: Ic5632658c483ab345c4ce0375f4e506b9fd495ac
Bill Yi [Mon, 5 Dec 2016 18:55:03 +0000 (18:55 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
3703206a9c3792c19c759679fc1fb107a0451cbe.
Change-Id: I4c56ddc60e7ebbf82d6d4a3ac792a2580f3ba261
Bill Yi [Mon, 5 Dec 2016 18:51:22 +0000 (18:51 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev am:
a1b10fcdb9 -s ours
am:
3bd3fb4488 -s ours
Change-Id: I1f881ef6552a25bfc5c49b81bf4dcffcc68194eb
Bill Yi [Mon, 5 Dec 2016 18:50:16 +0000 (18:50 +0000)]
Revert "Import translations. DO NOT MERGE" am:
05ab7a37a4 -s ours
am:
c48611ed9c -s ours
Change-Id: I91274dda23fed574e5c6c7b75f252bd90d9a23e5
Jeff Sharkey [Mon, 5 Dec 2016 18:19:28 +0000 (11:19 -0700)]
Initial Binder interface for installd.
Start using new installd Binder interface, with a quick-disable
switch if something breaks.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Ia6e55d49595c96ae928aefc8a6606ee690e58764
Bill Yi [Mon, 5 Dec 2016 18:43:14 +0000 (18:43 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
am:
a1b10fcdb9 -s ours
Change-Id: Ib21612d463f8918a3afea37932a517b555c6690c
Bill Yi [Mon, 5 Dec 2016 18:43:09 +0000 (18:43 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
05ab7a37a4 -s ours
Change-Id: I7ce400c10d832990993bdebda4317bff2ffe800e
Bill Yi [Mon, 5 Dec 2016 18:40:39 +0000 (18:40 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Bill Yi [Mon, 5 Dec 2016 18:40:10 +0000 (18:40 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
6561ccdb9911c8c5d1bd91055cdf5abfcc34e2d9.
Change-Id: I3455557b6d3597a8c6eb626a09cadabed3687ec6
Kouji Shiotani [Mon, 5 Dec 2016 18:38:37 +0000 (18:38 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev am:
8c917322a7
am:
737ecc8cbc
Change-Id: If2e6d1ad7496ceff868860df475ea15f0330da77
Kouji Shiotani [Mon, 5 Dec 2016 18:37:39 +0000 (18:37 +0000)]
To enable scroll function at DatePickerDialog am:
6b04f11100
am:
e0349a49f3
Change-Id: I9e3534bf470a295efbb9f545e14690819ff1adbd
Bill Yi [Mon, 5 Dec 2016 18:35:35 +0000 (18:35 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
Bill Yi [Mon, 5 Dec 2016 18:35:00 +0000 (18:35 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
52ae3289fba02b03b7cb74afad628b9c80253045.
Change-Id: I629775ecf2470e8a16eb58df5cb1e8406865a6ba
Bill Yi [Mon, 5 Dec 2016 18:34:34 +0000 (18:34 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""
Bill Yi [Mon, 5 Dec 2016 18:33:57 +0000 (18:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
e16ad0588743c06a7cf307891f00cc53c647006d.
Change-Id: I42cda0cebdd40afd32b27dca3167da2103f340bf
Kouji Shiotani [Mon, 5 Dec 2016 18:31:20 +0000 (18:31 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
am:
8c917322a7
Change-Id: I4d5a3afeb1b04f3ea955ed92bad3430d117d27ac
Kouji Shiotani [Mon, 5 Dec 2016 18:31:14 +0000 (18:31 +0000)]
To enable scroll function at DatePickerDialog
am:
6b04f11100
Change-Id: I75d4c9ee283d4b76366ab042a50739d788de1764
TreeHugger Robot [Mon, 5 Dec 2016 18:23:53 +0000 (18:23 +0000)]
Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
Michael Kwan [Mon, 5 Dec 2016 18:22:35 +0000 (18:22 +0000)]
Merge "Disable swipe-to-dismiss for not cancelable dialogs. am:
f7964be938 am:
9120012566" into nyc-mr2-dev-plus-aosp
am:
1f5e83894e
Change-Id: I73d9ebe80ce6616dca4409350a21a391bff6c1ef
Michael Kwan [Mon, 5 Dec 2016 18:22:27 +0000 (18:22 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs. am:
f7964be938 am:
9120012566
am:
dbc5a93449
Change-Id: I66d0e42910a13ffa044c5029e746736d88cc9fc1
Michael Kwan [Mon, 5 Dec 2016 18:21:14 +0000 (18:21 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs. am:
f7964be938 am:
85ba660b16
am:
1805ba1d76
Change-Id: I23863328b64f95915a7ecb7ceb35448bc10bdfbe
OSDN Git Service
