OSDN Git Service
Bill Yi [Wed, 17 Aug 2016 17:48:23 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE
am:
722903594e -s ours
Change-Id: I250c39b7fb65641fcb2ea1f593511a76cc2da24a
Bill Yi [Wed, 17 Aug 2016 17:48:18 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4bdc6b6c9f -s ours
Change-Id: If6ff278b09f1162111aee9ec2281bcfc156c7c11
Bill Yi [Wed, 17 Aug 2016 17:48:15 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE
am:
03fa77f054 -s ours
Change-Id: I3434d54d4ba5673ba174c76dd8ddf5a52afcf31b
Phil Burk [Wed, 17 Aug 2016 17:09:14 +0000 (17:09 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()" am:
c5b376ab66 am:
86fbbfb6f0
am:
4317410c40
Change-Id: I763d30fa9a94c23a26315cad7ebac9aeb7f78c73
Tobias Thierer [Wed, 17 Aug 2016 17:09:11 +0000 (17:09 +0000)]
Merge "Track libcore update of Map classes to jdk8u60." am:
ec6a323da2 am:
17fea8b967
am:
8fc0ac9b39
Change-Id: Ia814e0be0e66022a373c8a8e4bc27a71ce85d866
Phil Burk [Wed, 17 Aug 2016 17:03:47 +0000 (17:03 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()" am:
c5b376ab66
am:
86fbbfb6f0
Change-Id: I938d0365abffe9cb05a7c10d80562e3742290853
Tobias Thierer [Wed, 17 Aug 2016 17:03:44 +0000 (17:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60." am:
ec6a323da2
am:
17fea8b967
Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
Tobias Thierer [Wed, 17 Aug 2016 17:00:13 +0000 (17:00 +0000)]
Revert "Track libcore update of Map classes to jdk8u60" am:
7783213611
am:
5efe2b7515
Change-Id: Ic9386c17ec28b68de3127057eafbc60399e44f47
Tobias Thierer [Wed, 17 Aug 2016 17:00:09 +0000 (17:00 +0000)]
Track libcore update of Map classes to jdk8u60 am:
fb2ade3dca
am:
eb4eeb5323
Change-Id: I97ae4e7346424b6c58bc15f3682293d2854db23c
Phil Burk [Wed, 17 Aug 2016 16:59:06 +0000 (16:59 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
am:
c5b376ab66
Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868
Tobias Thierer [Wed, 17 Aug 2016 16:54:30 +0000 (16:54 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
am:
ec6a323da2
Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
Tobias Thierer [Wed, 17 Aug 2016 16:54:08 +0000 (16:54 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
am:
7783213611
Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
Tobias Thierer [Wed, 17 Aug 2016 16:54:05 +0000 (16:54 +0000)]
Track libcore update of Map classes to jdk8u60
am:
fb2ade3dca
Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
Tobias Thierer [Wed, 17 Aug 2016 14:50:59 +0000 (14:50 +0000)]
Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.
Bug:
30911913
This reverts commit
fb2ade3dcab0962f18acab720875c75622f412ed.
Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
Treehugger Robot [Wed, 17 Aug 2016 13:57:33 +0000 (13:57 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
Tobias Thierer [Thu, 11 Aug 2016 18:47:02 +0000 (19:47 +0100)]
Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640
This CL requires base CLs, which will get merged from aosp-master,
in order to build.
Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
Tobias Thierer [Wed, 17 Aug 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."
Phil Burk [Tue, 5 Apr 2016 18:25:36 +0000 (11:25 -0700)]
UsbMidiDevice: fix MIDI flush()
The proxy MidiReceiver in the USB device was not forwarding the flush
command to the event scheduler.
Bug:
25511696
Change-Id: I6a4759b71bc8f9ae3e20aed1238f62a2ed405e24
Signed-off-by: Phil Burk <philburk@google.com>
Bill Yi [Tue, 16 Aug 2016 17:40:10 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Tobias Thierer [Fri, 5 Aug 2016 18:58:02 +0000 (19:58 +0100)]
Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.
Test: make update-api
Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:39:40 +0000 (02:39 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea537bf5b3 am:
9c0b881c9d
am:
1ab51f3769
Change-Id: Ide274953e85d1ba9e0e978a531d69c3543e7923a
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:31:42 +0000 (02:31 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
ea537bf5b3
am:
9c0b881c9d
Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c
Chih-Hung Hsieh [Tue, 16 Aug 2016 02:23:48 +0000 (02:23 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
ea537bf5b3
Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
Treehugger Robot [Tue, 16 Aug 2016 02:12:38 +0000 (02:12 +0000)]
Merge "Fix google-explicit-constructor warnings."
Bill Yi [Tue, 16 Aug 2016 02:03:54 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1e14fdd967a5e1abbf775ea762a369d562a90dd
Auto-generated-cl: translation import
Rob Carr [Tue, 16 Aug 2016 02:02:24 +0000 (02:02 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev am:
c991a7ad54
am:
fd1da97fc7
Change-Id: I3b9d145af200f1a075dc65c334fff49c1a4adc26
Robert Carr [Tue, 16 Aug 2016 02:01:31 +0000 (02:01 +0000)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children. am:
aab09158e9
am:
878507072a
Change-Id: I7af88b8bb27dcceb624b392a536cf0ce49a8e71f
Robert Carr [Tue, 16 Aug 2016 01:59:40 +0000 (01:59 +0000)]
Allow seamless rotation before mTopIsFullscreen is set. am:
1ccd42510f
am:
2dcc35ab94
Change-Id: If41b31858f38e7c9c8a400ee4d25958f2adf947b
Dirk Dougherty [Tue, 16 Aug 2016 01:59:35 +0000 (01:59 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am:
114c09498d am:
13a5f3515f
am:
fa35f82d9b
Change-Id: I3ad7a07d2ef6001b4632b83d7e8822a33e1190fd
Dirk Dougherty [Tue, 16 Aug 2016 01:59:29 +0000 (01:59 +0000)]
Doc change: escape lt char in generic type in pre block. am:
1035b25825 am:
61a7f64e1f
am:
330ee9b965
Change-Id: I9bc7545b553a31e2973c6d48146f14e9f4b7be1f
Bill Yi [Tue, 16 Aug 2016 01:48:31 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d57a1d9c2c7742fe3f73355211fe54e514554eb
Auto-generated-cl: translation import
Rob Carr [Tue, 16 Aug 2016 01:46:06 +0000 (01:46 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev
am:
c991a7ad54
Change-Id: Ia26593ab5b53c34656af1095f63bffa9ebcde27f
Robert Carr [Tue, 16 Aug 2016 01:46:04 +0000 (01:46 +0000)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
am:
aab09158e9
Change-Id: If1c06bf70128af337d23bfa58157e16a0dea9b3b
Robert Carr [Tue, 16 Aug 2016 01:44:28 +0000 (01:44 +0000)]
Allow seamless rotation before mTopIsFullscreen is set.
am:
1ccd42510f
Change-Id: I52b5d288993a4fbf5b265f32e238b40a4b68f8d6
Dirk Dougherty [Tue, 16 Aug 2016 01:44:19 +0000 (01:44 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am:
114c09498d
am:
13a5f3515f
Change-Id: I421a40de8a7c3aee6ea087a12c6862b8051765a9
Robert Carr [Tue, 16 Aug 2016 01:44:17 +0000 (01:44 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev am:
b14543d9d8
am:
3cfbf180c7
Change-Id: I2c55b6600ffd2aab5d3ada06a10bb804d256dbd2
Dirk Dougherty [Tue, 16 Aug 2016 01:44:14 +0000 (01:44 +0000)]
Doc change: escape lt char in generic type in pre block. am:
1035b25825
am:
61a7f64e1f
Change-Id: Id086866cc0c047fb8ea88cb16c863ebd11b7f7b0
Robert Carr [Tue, 16 Aug 2016 01:44:07 +0000 (01:44 +0000)]
Introduce new constant for double tap gesture rotation hint. am:
57d9fbd17f
am:
5f684d92b6
Change-Id: Idf2bb8511e24732018ff59ffbf30f440cb7f9779
Robert Carr [Tue, 16 Aug 2016 01:36:05 +0000 (01:36 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
am:
b14543d9d8
Change-Id: I3edf4558a7cfabb40abc9cfc9393288d2a5b72b8
Robert Carr [Tue, 16 Aug 2016 01:35:59 +0000 (01:35 +0000)]
Introduce new constant for double tap gesture rotation hint.
am:
57d9fbd17f
Change-Id: I994c15c692ec52160deb3d29b46396802562588a
Dirk Dougherty [Tue, 16 Aug 2016 01:35:39 +0000 (01:35 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev am:
114c09498d
am:
c9107e3263
Change-Id: I906743944b80516ed22653c9ffbeb0f6853b21e0
Dirk Dougherty [Tue, 16 Aug 2016 01:35:37 +0000 (01:35 +0000)]
Doc change: escape lt char in generic type in pre block. am:
1035b25825
am:
f98babb134
Change-Id: I2895902daa143cb427d37d44dcd0c8957c9aa082
Rob Carr [Tue, 16 Aug 2016 01:31:31 +0000 (01:31 +0000)]
Merge changes I082e323e,I326bf776 into nyc-mr1-dev
* changes:
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
Allow seamless rotation before mTopIsFullscreen is set.
Dirk Dougherty [Tue, 16 Aug 2016 01:30:07 +0000 (01:30 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am:
114c09498d
Change-Id: Ie7f79a9236823a9066867fb52bf352523730ec3f
Dirk Dougherty [Tue, 16 Aug 2016 01:30:04 +0000 (01:30 +0000)]
Doc change: escape lt char in generic type in pre block.
am:
1035b25825
Change-Id: I4e4c01fe612bbcf05c31c6d33da6bbbe837aa468
Dirk Dougherty [Tue, 16 Aug 2016 01:29:51 +0000 (01:29 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am:
114c09498d
Change-Id: I436715dc13b9b9e8abc8d5c84d04e1e203269e7a
Dirk Dougherty [Tue, 16 Aug 2016 01:29:47 +0000 (01:29 +0000)]
Doc change: escape lt char in generic type in pre block.
am:
1035b25825
Change-Id: Iecc647ac91d9d6d452091c214138a6e650babac0
TreeHugger Robot [Tue, 16 Aug 2016 01:21:56 +0000 (01:21 +0000)]
Merge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
Dirk Dougherty [Tue, 16 Aug 2016 01:17:31 +0000 (01:17 +0000)]
Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
Suprabh Shukla [Tue, 16 Aug 2016 00:56:47 +0000 (00:56 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am:
f5e51cf7a9
am:
ae54fae453
Change-Id: I9919c3614d5b757ab1bb84568eb836e4d7d3d0a5
Suprabh Shukla [Tue, 16 Aug 2016 00:56:43 +0000 (00:56 +0000)]
Changing user inactivity and warning dialog timeouts am:
cafdc2e50d
am:
925a30e82b
Change-Id: Ia999e7deec13087cb0084b21b737fbff7aaf0bf4
Fyodor Kupolov [Tue, 16 Aug 2016 00:41:36 +0000 (00:41 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev am:
ab35493046
am:
8b85bed24b
Change-Id: I918da4f2cff5ad55258ee2f4c10631887b4eb113
Fyodor Kupolov [Tue, 16 Aug 2016 00:41:32 +0000 (00:41 +0000)]
Count failed install as finished am:
4f4780f023
am:
dc2963f20b
Change-Id: I967f127a11d195549373c357436c3a9002f39e0d
Suprabh Shukla [Tue, 16 Aug 2016 00:32:56 +0000 (00:32 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
am:
f5e51cf7a9
Change-Id: Ic44c61742ba56f887cf90ab6428b8c8642e355e3
Suprabh Shukla [Tue, 16 Aug 2016 00:32:55 +0000 (00:32 +0000)]
Changing user inactivity and warning dialog timeouts
am:
cafdc2e50d
Change-Id: Iba74fd833ba00cbae39e09cf404f1877efd7a4d8
Fyodor Kupolov [Tue, 16 Aug 2016 00:25:59 +0000 (00:25 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev
am:
ab35493046
Change-Id: I5e65fd656bcad8b8de5742e01e90709954bb7102
Fyodor Kupolov [Tue, 16 Aug 2016 00:25:57 +0000 (00:25 +0000)]
Count failed install as finished
am:
4f4780f023
Change-Id: Ia1ddcde1b9bcb37a266589ff53ed01632e442c7b
TreeHugger Robot [Tue, 16 Aug 2016 00:21:34 +0000 (00:21 +0000)]
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
TreeHugger Robot [Mon, 15 Aug 2016 23:58:06 +0000 (23:58 +0000)]
Merge "Count failed install as finished" into nyc-mr1-dev
Adrian Roos [Mon, 15 Aug 2016 23:57:48 +0000 (23:57 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev am:
094b8b3321
am:
88dead0f19
Change-Id: Ib21b08a7ad50aa7262778ca1930a10e782d37aa5
Adrian Roos [Mon, 15 Aug 2016 23:57:45 +0000 (23:57 +0000)]
Fix bug where RemoteInputView didn't reopen the IME am:
0356865dad
am:
2bf73bbb43
Change-Id: I5e5561ee9831946325df02f806d9c32cbb30555b
Adrian Roos [Mon, 15 Aug 2016 23:49:01 +0000 (23:49 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
am:
094b8b3321
Change-Id: I308a6550ce47b0083b28a2a2cf89d82b692b2939
Adrian Roos [Mon, 15 Aug 2016 23:48:58 +0000 (23:48 +0000)]
Fix bug where RemoteInputView didn't reopen the IME
am:
0356865dad
Change-Id: I983cd6d0abc35af375d95722606969f13aebb9f5
TreeHugger Robot [Mon, 15 Aug 2016 23:45:04 +0000 (23:45 +0000)]
Merge "Fix bug where RemoteInputView didn't reopen the IME" into nyc-mr1-dev
Adam Lesinski [Mon, 15 Aug 2016 23:22:13 +0000 (23:22 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev am:
1031069f1d
am:
ae5a79ad12
Change-Id: I8749fcefe6c98cf6609abac49b368fd2c5201eac
Adam Lesinski [Mon, 15 Aug 2016 23:22:04 +0000 (23:22 +0000)]
AAPT: Fix use-after-free error am:
193ed74c2d
am:
646f2d9c33
Change-Id: If9fe7a52e62ae6b2900aa187996b4b785894ab03
Adam Lesinski [Mon, 15 Aug 2016 23:11:49 +0000 (23:11 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev
am:
1031069f1d
Change-Id: Ic2fce0e9b9769630f9a59065f317ea34201be079
Adam Lesinski [Mon, 15 Aug 2016 23:11:37 +0000 (23:11 +0000)]
AAPT: Fix use-after-free error
am:
193ed74c2d
Change-Id: I04cd726dae52c5010ad99409f0f77a10267bdeed
TreeHugger Robot [Mon, 15 Aug 2016 22:56:00 +0000 (22:56 +0000)]
Merge "AAPT: Fix use-after-free error" into nyc-mr1-dev
Tyler Gunn [Mon, 15 Aug 2016 22:50:34 +0000 (22:50 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev am:
aa9b18f90a
am:
273f01785d
Change-Id: I53490a7d67d8dc909049338ec7470acdc8cf801f
Tyler Gunn [Mon, 15 Aug 2016 22:50:30 +0000 (22:50 +0000)]
Add missing remote conference property set. am:
04ce757860
am:
69c13eca0e
Change-Id: Ia6db6017bde649b451c82ec3280deeba4e3989b7
Suprabh Shukla [Mon, 15 Aug 2016 19:50:32 +0000 (12:50 -0700)]
Changing user inactivity and warning dialog timeouts
Increasing the inactivity timeout to 90 seconds to accomodate the longest
app. demo video for retail. Also, removing the warning dialog by setting
the countdown timeout to 0, so it can be re-enabled by overriding the value
through gservices if needed.
Bug:
30426773
Bug:
30866394
Change-Id: I6735943adfaf3d210ed9eb9163b5c7ce8dcf53ec
Tyler Gunn [Mon, 15 Aug 2016 22:42:38 +0000 (22:42 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev
am:
aa9b18f90a
Change-Id: I1176b63a1d84829b79b9e540747a27b777e88c47
Tyler Gunn [Mon, 15 Aug 2016 22:42:36 +0000 (22:42 +0000)]
Add missing remote conference property set.
am:
04ce757860
Change-Id: Iba041654d136b3cd00cfc19899cefa68ebf01b76
Tyler Gunn [Mon, 15 Aug 2016 22:32:02 +0000 (22:32 +0000)]
Merge "Add missing remote conference property set." into nyc-mr1-dev
Fyodor Kupolov [Mon, 15 Aug 2016 22:29:47 +0000 (15:29 -0700)]
Count failed install as finished
Otherwise DEMO_USER_SETUP_COMPLETE will not be set.
Bug:
30445353
Change-Id: Id2a0c1b1643dd9846328a20f4c67e11e69b3bc84
Robert Carr [Mon, 15 Aug 2016 19:19:00 +0000 (12:19 -0700)]
Limit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
In what can only be called an unfortunate workaround we require
seamlessly rotated child windows to have the
TRANSFORM_TO_DISPLAY_INVERSE
flag. Due to limitations in the client API, there is no way for the
client to set this flag in a race free fashion. If we seamlessly rotate
a window which does not have this flag, but then it gains it,
we will have an incorrect visual result (rotated buffer contents). This
means if we want to support seamlessly rotating windows which could gain
this flag, we can't seamlessly rotate windows which don't have it. This
unfortunately limits seamless rotation in N to Camera framework users,
native code, and applications without child windows. This is unfortunate
but having the camera work was always our primary use case, and it's not
as if we are offering an API for it, it's a behind the scenes
enhancement of ROTATION_ANIMATION_JUMPCUT.
Bug:
30171992
Change-Id: I082e323ee569cfc1ff2559657cc22194c251c7ec
Selim Cinek [Mon, 15 Aug 2016 22:10:54 +0000 (22:10 +0000)]
Fixed an issue where the background could show in a wrong way am:
d381bc3133
am:
3ff0c5b3ce
Change-Id: I1f02f607593fbf9adcaae6cf92bb5ec559bcaa21
Adrian Roos [Mon, 15 Aug 2016 22:02:46 +0000 (15:02 -0700)]
Fix bug where RemoteInputView didn't reopen the IME
Editable TextViews are implicitly selectable. Setting the selectable
property to true however causes a bug where the onTouch logic thinks
the view is not editable and thus doesn't show the IME when clicking
that view.
Change-Id: I9dd6139195bd98b26293e330290650d4e5549a6d
Fixes:
30595718
Selim Cinek [Mon, 15 Aug 2016 22:02:18 +0000 (22:02 +0000)]
Fixed an issue where the background could show in a wrong way
am:
d381bc3133
Change-Id: I219e4809a6a9f839353e049d4d563ece37866ca2
Chih-Hung Hsieh [Mon, 15 Aug 2016 21:45:02 +0000 (14:45 -0700)]
Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
Selim Cinek [Mon, 15 Aug 2016 19:40:57 +0000 (12:40 -0700)]
Fixed an issue where the background could show in a wrong way
Change-Id: Icefeb2275d6cbabc576c35990ce4441b3a41ebd9
Fixes:
30855224
Dianne Hackborn [Mon, 15 Aug 2016 21:35:57 +0000 (21:35 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev am:
6af2db3824
am:
1377b38053
Change-Id: If3400e262cdfa9bdbf19af1dcad61bce967ba06b
Dianne Hackborn [Mon, 15 Aug 2016 21:35:48 +0000 (21:35 +0000)]
Docs only: N is no longer a shrug. am:
c1b607df71
am:
6fe27966e2
Change-Id: I0d441487fae3e95741f83ab92042bca7547006ae
Dianne Hackborn [Mon, 15 Aug 2016 21:25:44 +0000 (21:25 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev
am:
6af2db3824
Change-Id: Idae2d16055e26e721584e428c44af0f2b1828557
Dianne Hackborn [Mon, 15 Aug 2016 21:25:41 +0000 (21:25 +0000)]
Docs only: N is no longer a shrug.
am:
c1b607df71
Change-Id: Iaf3a4c23ec9c94dccfa6db15e6caf90a74a5f3c0
Adam Lesinski [Mon, 15 Aug 2016 21:19:46 +0000 (14:19 -0700)]
AAPT: Fix use-after-free error
Re-order deletion of ResXMLTree and the Asset object
it iterates over.
Bug:
30844391
Change-Id: Ied033d0a8f93343006228a2054c6d0f42bb4717a
Dianne Hackborn [Mon, 15 Aug 2016 21:16:41 +0000 (21:16 +0000)]
Merge "Docs only: N is no longer a shrug." into nyc-mr1-dev
Chong Zhang [Mon, 15 Aug 2016 21:08:33 +0000 (21:08 +0000)]
Wallpaper target selection during animation am:
b0d267043a
am:
f74e7ee4a3
Change-Id: Iacf65c88743cdbd2b40cfee0be4ba844fb122be8
Chong Zhang [Mon, 15 Aug 2016 20:51:52 +0000 (20:51 +0000)]
Wallpaper target selection during animation
am:
b0d267043a
Change-Id: Ib649f9399d6c9f7f84f05ddef8dd8e3d87bb7923
Chong Zhang [Fri, 12 Aug 2016 23:03:29 +0000 (16:03 -0700)]
Wallpaper target selection during animation
In case of double tapping from Home, there could be two set of
transitions, first is launcher->Recents, followed shortly by
Recents->app. On the second transition, it should be running
a wallpaper close, but because of the way we pick wallpaper
target, sometimes we pick launcher if both launcher & Recents
are animating away. This makes us to run a different animation
which could involve dimming the wallpaper briefly.
Also, findWallpaperTarget() sometimes could toggle between two
valid wallpaper targets, picking either of them gives correct
result for showing the wallpaper, but could result in different
exit transition.
This change prefers the visible target if there is only one
visible, otherwise the one in opening or closing app list. This
helps maybeUpdateTransitToWallpaper to better choose transition.
bug:
30831873
Change-Id: I0eaa89bdc35f5f51875d5cbeceba11ce40f4791f
Julius D'souza [Mon, 15 Aug 2016 20:07:16 +0000 (20:07 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours am:
f51dfc24d1 -s ours am:
e543fb29b2 -s ours
am:
603e631c51 -s ours
Change-Id: I76cd0c0bd8c01c6ded00681903a1dabbe4760df3
Julius D'souza [Mon, 15 Aug 2016 19:56:18 +0000 (19:56 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours am:
f51dfc24d1 -s ours
am:
6864ffeead -s ours
Change-Id: I61414d658c8ebb77add50ee4c9319bf3c8f0297d
Julius D'souza [Mon, 15 Aug 2016 19:55:56 +0000 (19:55 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours am:
f51dfc24d1 -s ours
am:
e543fb29b2 -s ours
Change-Id: Ic9de880e84205d0bed213e56cf476e1d15dfcfa9
Julius D'souza [Mon, 15 Aug 2016 19:47:43 +0000 (19:47 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours
am:
f51dfc24d1 -s ours
Change-Id: I1afeaa3f5321c536cad22455881b36582b468748
Julius D'souza [Mon, 15 Aug 2016 19:47:33 +0000 (19:47 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am:
13edf0a70b -s ours am:
0903c5fe7a -s ours
am:
f51dfc24d1 -s ours
Change-Id: Iada12a5685d32efafedd18b4d6fba5b8cc642f60
Jason Monk [Mon, 15 Aug 2016 19:47:33 +0000 (19:47 +0000)]
Merge "QS Footer: Don't update icon from wrong thread." into nyc-mr1-dev am:
aedfa81517
am:
1d2ef7f1b8
Change-Id: Ia381e4ae34d263829531d52ba689dc8bfb9f4070
Jason Monk [Mon, 15 Aug 2016 19:47:30 +0000 (19:47 +0000)]
QS Footer: Don't update icon from wrong thread. am:
f9c6026a7d
am:
b10b51277f
Change-Id: If585197223ec5767c2f63dce8717eda82d482a30
Jason Monk [Mon, 15 Aug 2016 19:35:00 +0000 (19:35 +0000)]
Merge "QS Footer: Don't update icon from wrong thread." into nyc-mr1-dev
am:
aedfa81517
Change-Id: I281d14459a03556d96236a9ebb2a08ebd2c53110
Jason Monk [Mon, 15 Aug 2016 19:34:58 +0000 (19:34 +0000)]
QS Footer: Don't update icon from wrong thread.
am:
f9c6026a7d
Change-Id: Ie473b181aaf6fc4ea91d8e986188cdc6f06d87ef
OSDN Git Service
