OSDN Git Service

android-x86/frameworks-base.git
8 years agodocs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: 39cc61a4db
Eric Schmidt [Wed, 17 Aug 2016 18:18:33 +0000 (18:18 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: 39cc61a4db
am: 2367fb1c56

Change-Id: Ibbca09bc1667ba02e9c6d99f39350ca8bb6d5e61

8 years agoMerge "Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:07:23 +0000 (18:07 +0000)]
Merge "Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp am: 8fa05abfab" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:07:08 +0000 (18:07 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29 am: 150ab094ed" into nyc-mr1-dev-plus-aosp

8 years agodocs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7
Eric Schmidt [Wed, 17 Aug 2016 18:06:55 +0000 (18:06 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7
am: 39cc61a4db

Change-Id: I68dd3b9ebc95fe57fe9e4553f87774c69bb10df1

8 years agoMerge "Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:52 +0000 (18:06 +0000)]
Merge "Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37" into nyc-dev-plus-aosp am: d604595820" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef9...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:39 +0000 (18:06 +0000)]
Merge "Merge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef993e2d am: 8f7f6abd09" into nyc-mr1-dev-plus-aosp

8 years agoMerge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:26 +0000 (18:06 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37 am: 97b75e6ce9" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Replace android auto assets with the latest am: e45311adc9 am: a7ad4e2e45...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:15 +0000 (18:06 +0000)]
Merge "Replace android auto assets with the latest am: e45311adc9 am: a7ad4e2e45" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddf...
Android Build Merger (Role) [Wed, 17 Aug 2016 18:06:06 +0000 (18:06 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe am: 900471ab11" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into...
Tobias Thierer [Wed, 17 Aug 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp
am: 8fa05abfab

Change-Id: Iafd93f9ebbe74b34359d0d83e0aaca2013d19a4b

8 years agoMerge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage...
Tobias Thierer [Wed, 17 Aug 2016 18:05:02 +0000 (18:05 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29
am: 150ab094ed

Change-Id: If378d5a5759462ffef5c45907b7f08328ee696c0

8 years agoMerge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am...
Eric Schmidt [Wed, 17 Aug 2016 18:04:53 +0000 (18:04 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37" into nyc-dev-plus-aosp
am: d604595820

Change-Id: I99e76a8e1324d963f6ce1cdb907117b848e07190

8 years agodocs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37
Eric Schmidt [Wed, 17 Aug 2016 18:04:49 +0000 (18:04 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37
am: 97b75e6ce9

Change-Id: Ic036c1e7cb80aab24b7535fb364a49abbcf79e7a

8 years agoMerge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef993e2d
Sriram Viswanathan [Wed, 17 Aug 2016 18:04:36 +0000 (18:04 +0000)]
Merge "Replace android auto assets with the latest" into nyc-mr1-dev am: 91ef993e2d
am: 8f7f6abd09

Change-Id: I53c24a5726bf633474fcba1814bed4ec0ae09217

8 years agoRevert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe
Tobias Thierer [Wed, 17 Aug 2016 18:04:36 +0000 (18:04 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe
am: 900471ab11

Change-Id: I14364e0805996c1bfe37e607bd58f35bd51101c8

8 years agoReplace android auto assets with the latest am: e45311adc9
Sriram Viswanathan [Wed, 17 Aug 2016 18:04:29 +0000 (18:04 +0000)]
Replace android auto assets with the latest am: e45311adc9
am: a7ad4e2e45

Change-Id: I8358957ea74d8d815189cf5a843c978fca61c777

8 years agoFix maps resume being blank am: 03df0834e6
John Reck [Wed, 17 Aug 2016 18:04:21 +0000 (18:04 +0000)]
Fix maps resume being blank am: 03df0834e6
am: 08669fff33

Change-Id: If87b076b6c03b7018485ddd4438aeaac7abd1562

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 60ab8d072a -s ours
Bill Yi [Wed, 17 Aug 2016 18:04:14 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 60ab8d072a  -s ours
am: d165fa2027  -s ours

Change-Id: Icc61d51603a9806af0849a9aec01a4e58becffb1

8 years agoImport translations. DO NOT MERGE am: ad0dfea172 -s ours
Bill Yi [Wed, 17 Aug 2016 18:04:10 +0000 (18:04 +0000)]
Import translations. DO NOT MERGE am: ad0dfea172  -s ours
am: 217addf432  -s ours

Change-Id: Iac7336e1739740dd752e1e5d71b4ba9618ad5819

8 years agoMerge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into...
Android Build Merger (Role) [Wed, 17 Aug 2016 17:54:57 +0000 (17:54 +0000)]
Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp

8 years agoMerge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am...
Android Build Merger (Role) [Wed, 17 Aug 2016 17:54:51 +0000 (17:54 +0000)]
Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37" into nyc-dev-plus-aosp

8 years agodocs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7
Eric Schmidt [Wed, 17 Aug 2016 17:54:21 +0000 (17:54 +0000)]
docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7
am: c89c8c3e37

Change-Id: I0193239ada03ca2e5bc5ab856f778f69a691b325

8 years agoMerge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage...
Tobias Thierer [Wed, 17 Aug 2016 17:54:12 +0000 (17:54 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master
am: 6f15eabd29

Change-Id: Ic1c3c789ffdc7b9d1f59faea6292c8f3489e8ad4

8 years agoRevert "Revert "Track libcore update of Map classes to jdk8u60""
Tobias Thierer [Wed, 17 Aug 2016 17:54:08 +0000 (17:54 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""
am: 7f5095ddfe

Change-Id: I815b5c9b5620fb1fc9f18dd6b0bb0d185c114410

8 years agodocs: Docs for Support Library 24.2.0 release
Andrew Solovay [Wed, 17 Aug 2016 17:48:47 +0000 (17:48 +0000)]
docs: Docs for Support Library 24.2.0 release
am: 085994c40d

Change-Id: I7e69bf585d342f1075856673e52ff15207be4a1c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 48d01fde6b -s ours
Bill Yi [Wed, 17 Aug 2016 17:48:43 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 48d01fde6b  -s ours
am: c182b0067e  -s ours

Change-Id: I244e2f5ccc90487e825f94b241b613138a008139

8 years agoImport translations. DO NOT MERGE am: 28753c7c4a -s ours
Bill Yi [Wed, 17 Aug 2016 17:48:39 +0000 (17:48 +0000)]
Import translations. DO NOT MERGE am: 28753c7c4a  -s ours
am: 5b0b9696bb  -s ours

Change-Id: I0a9c90c2cc4e9fbea518a27fb0a0fe75b095689e

8 years agoMerge "Hide space for title if the title is GONE." into cw-f-dev
Michael Kwan [Wed, 17 Aug 2016 17:48:36 +0000 (17:48 +0000)]
Merge "Hide space for title if the title is GONE." into cw-f-dev
am: dc0735676b

Change-Id: Ie66f71281c6cea959fe5ddb44dbc815854d0c3f0

8 years agoHide space for title if the title is GONE.
Michael Kwan [Wed, 17 Aug 2016 17:48:32 +0000 (17:48 +0000)]
Hide space for title if the title is GONE.
am: 790a34e1a9

Change-Id: I515514013819133228f3185166fe7962ab2f27c8

8 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 17 Aug 2016 17:48:27 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: ab2c244135  -s ours

Change-Id: I0f157e5edbbd3e85ee32dda3ed379f72e854bbd7

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage...
Tobias Thierer [Wed, 17 Aug 2016 17:38:46 +0000 (17:38 +0000)]
Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master

8 years agoMerge "Replace android auto assets with the latest" into nyc-mr1-dev
Sriram Viswanathan [Wed, 17 Aug 2016 17:14:29 +0000 (17:14 +0000)]
Merge "Replace android auto assets with the latest" into nyc-mr1-dev
am: 91ef993e2d

Change-Id: I7d992d83ebd185c1e67ecd24c3d5fd30e4c87fb8

8 years agoReplace android auto assets with the latest
Sriram Viswanathan [Wed, 17 Aug 2016 17:14:27 +0000 (17:14 +0000)]
Replace android auto assets with the latest
am: e45311adc9

Change-Id: Ied7a5adcceda1efba66e91d97a835c7ccf870f4d

8 years agoFix maps resume being blank
John Reck [Wed, 17 Aug 2016 17:14:23 +0000 (17:14 +0000)]
Fix maps resume being blank
am: 03df0834e6

Change-Id: Iad93e1b11e74acf2356d59c271892d6741b53fef

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Wed, 17 Aug 2016 17:14:20 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 60ab8d072a  -s ours

Change-Id: I35ebad1911c8d548f3918026be446075a471d1c8

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 17 Aug 2016 17:14:18 +0000 (17:14 +0000)]
Import translations. DO NOT MERGE
am: ad0dfea172  -s ours

Change-Id: I68667b5fd3777621b425093da0b64106f6dfc09c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Wed, 17 Aug 2016 17:14:15 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 48d01fde6b  -s ours

Change-Id: Id88552a95441037ef5825a81311a95b9dd66ac73

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 17 Aug 2016 17:14:13 +0000 (17:14 +0000)]
Import translations. DO NOT MERGE
am: 28753c7c4a  -s ours

Change-Id: Ie2d08b1e339982bc8606ff4ecf58487604220bfe

8 years agodocs: Fixed code snippet in notify-user/navigation.html
Eric Schmidt [Wed, 17 Aug 2016 17:14:11 +0000 (17:14 +0000)]
docs: Fixed code snippet in notify-user/navigation.html
am: 32cc6b7fb7

Change-Id: I43cf6d188bac5cc5b3d0894915ff431e13156cd5

8 years agoRevert "Revert "Track libcore update of Map classes to jdk8u60""
Tobias Thierer [Wed, 17 Aug 2016 17:11:01 +0000 (17:11 +0000)]
Revert "Revert "Track libcore update of Map classes to jdk8u60""

Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 778321361132672ea1174e4ca3f5397477c32690.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff

8 years agoMerge "UsbMidiDevice: fix MIDI flush()" am: c5b376ab66 am: 86fbbfb6f0
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

8 years agoMerge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2 am: 17fea8b967
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

8 years agoMerge "UsbMidiDevice: fix MIDI flush()" am: c5b376ab66
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

8 years agoMerge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2
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

8 years agoRevert "Track libcore update of Map classes to jdk8u60" am: 7783213611
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

8 years agoTrack libcore update of Map classes to jdk8u60 am: fb2ade3dca
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

8 years agoMerge "UsbMidiDevice: fix MIDI flush()"
Phil Burk [Wed, 17 Aug 2016 16:59:06 +0000 (16:59 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"
am: c5b376ab66

Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868

8 years agoMerge "Track libcore update of Map classes to jdk8u60."
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

8 years agoRevert "Track libcore update of Map classes to jdk8u60"
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

8 years agoTrack libcore update of Map classes to jdk8u60
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

8 years agoRevert "Track libcore update of Map classes to jdk8u60"
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

8 years agoMerge "UsbMidiDevice: fix MIDI flush()"
Treehugger Robot [Wed, 17 Aug 2016 13:57:33 +0000 (13:57 +0000)]
Merge "UsbMidiDevice: fix MIDI flush()"

8 years agoTrack libcore update of Map classes to jdk8u60
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

8 years agoMerge "Track libcore update of Map classes to jdk8u60."
Tobias Thierer [Wed, 17 Aug 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Track libcore update of Map classes to jdk8u60."

8 years agoUsbMidiDevice: fix MIDI flush()
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>
8 years agodocs: Docs for Support Library 24.2.0 release
Andrew Solovay [Tue, 2 Aug 2016 21:24:58 +0000 (14:24 -0700)]
docs: Docs for Support Library 24.2.0 release

Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.

Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.

See first comment for doc stage location.

bug: 30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724

8 years agoMerge "Replace android auto assets with the latest" into nyc-mr1-dev
Sriram Viswanathan [Tue, 16 Aug 2016 18:20:10 +0000 (18:20 +0000)]
Merge "Replace android auto assets with the latest" into nyc-mr1-dev

8 years agoMerge "Hide space for title if the title is GONE." into cw-f-dev
Michael Kwan [Tue, 16 Aug 2016 17:56:41 +0000 (17:56 +0000)]
Merge "Hide space for title if the title is GONE." into cw-f-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Tue, 16 Aug 2016 17:40:33 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

8 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Tue, 16 Aug 2016 17:40:10 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

8 years agodocs: Fixed code snippet in notify-user/navigation.html
Eric Schmidt [Thu, 11 Aug 2016 19:54:31 +0000 (12:54 -0700)]
docs: Fixed code snippet in notify-user/navigation.html

Bug: 25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533

8 years agoFix maps resume being blank
John Reck [Tue, 16 Aug 2016 16:44:23 +0000 (09:44 -0700)]
Fix maps resume being blank

Bug: 30889568

Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.

Change-Id: Ib75065d3d75e6141d6cd8f306584f6a569b9907c

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 16 Aug 2016 15:32:03 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 16 Aug 2016 15:30:36 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoTrack libcore update of Map classes to jdk8u60.
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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Aug 2016 09:02:06 +0000 (02:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iae3ad7fc7b524b82d0e71c65a0d53a76b9ecff68
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Aug 2016 07:29:56 +0000 (00:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7c27b0c03c815ecccf209cd70ab764b836c7932b
Auto-generated-cl: translation import

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d
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

8 years agoMerge "Fix google-explicit-constructor warnings." am: ea537bf5b3
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

8 years agoMerge "Fix google-explicit-constructor warnings."
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

8 years agoMerge "Fix google-explicit-constructor warnings."
Treehugger Robot [Tue, 16 Aug 2016 02:12:38 +0000 (02:12 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev am: c991a7ad54
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

8 years agoLimit seamless rotation to TRANSFORM_INVERSE_DISPLAY children. am: aab09158e9
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

8 years agoAllow seamless rotation before mTopIsFullscreen is set. am: 1ccd42510f
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

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
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

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825 am: 61a7f64e1f
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev
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

8 years agoLimit seamless rotation to TRANSFORM_INVERSE_DISPLAY children.
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

8 years agoAllow seamless rotation before mTopIsFullscreen is set.
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

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
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

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1...
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

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825
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

8 years agoIntroduce new constant for double tap gesture rotation hint. am: 57d9fbd17f
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

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
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

8 years agoIntroduce new constant for double tap gesture rotation hint.
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

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev am...
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

8 years agoDoc change: escape lt char in generic type in pre block. am: 1035b25825
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

8 years agoMerge changes I082e323e,I326bf776 into nyc-mr1-dev
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.

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev
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

8 years agoDoc change: escape lt char in generic type in pre block.
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

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-dev
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

8 years agoDoc change: escape lt char in generic type in pre block.
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

8 years agoMerge "Introduce new constant for double tap gesture rotation hint." into nyc-mr1-dev
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

8 years agoMerge "Doc change: escape lt char in generic type in pre block." into nyc-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

8 years agoMerge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev am...
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