Commit Graph

283772 Commits

Author SHA1 Message Date
Yohei Yukawa
bce2195b9f Fix typos in JavaDoc for InputConnection am: 1ab959a6e0 am: 1a000651d5
am: cc2a206d92

Change-Id: Ia3d7a6f3a2ed2dc846642ce51c6b5e46ab72d0f2
2016-09-02 20:22:45 +00:00
Yohei Yukawa
d9c92d59bc Merge "Also Set IME_FLAG_NO_FULLSCREEN to RemoteEditText" into nyc-mr1-dev am: ede3f3fa27 am: c68332ba4e
am: ac503dc4f6

Change-Id: Ic0d5648755e526da30929719303b6f6e46e4150f
2016-09-02 20:17:18 +00:00
Yohei Yukawa
b67513f8cb Also Set IME_FLAG_NO_FULLSCREEN to RemoteEditText am: c2166b87b0 am: 6aa02a7bf3
am: 2fbbe67a4e

Change-Id: I6696740ff5449930c097ace623ee3a59465234b6
2016-09-02 20:17:13 +00:00
Svetoslav Ganov
0b2b0ba17f Merge "White-list grandfathered sync adapters" into nyc-mr1-dev am: a6cb2c2804 am: 5193b3cd22
am: 316f65ec28

Change-Id: I363aefdb01723c8ac0b5049920a22b96c80bce0b
2016-09-02 20:17:09 +00:00
Svet Ganov
ab51dcb24c White-list grandfathered sync adapters am: 65712b0ad3 am: 8b297cb1b1
am: ae28c1a0a1

Change-Id: Ia6923a3d65bd5be80fb459e1ec3f42f2ad25cafa
2016-09-02 20:10:42 +00:00
Wyatt Riley
8bc71250e6 Merge "Canada AGNSS settings update am: ff374d4def am: c742d95455 am: afa17f0708" into nyc-mr1-dev-plus-aosp
am: 8924ed0e49

Change-Id: Icfaa53a0d3f48f6c98f30753afacaf52b7e901ac
2016-09-02 20:10:37 +00:00
Wyatt Riley
62dab04a78 Canada AGNSS settings update am: ff374d4def am: c742d95455 am: afa17f0708
am: 363e1adcaa

Change-Id: I18498437526d82e06d0cbfe47a35ac9b6ee3c8c3
2016-09-02 20:10:33 +00:00
Chris Craik
619656aa31 Merge "Merge "Wait on frame work fences when frames are dropped" into nyc-mr1-dev am: 60fca42031 am: a60a2731d4" into nyc-mr1-dev-plus-aosp
am: 624ec720c0

Change-Id: Ic54b7595e1a23ab92cc8aa740a278ad530b44512
2016-09-02 20:10:23 +00:00
Chris Craik
c33e0a4f60 Merge "Wait on frame work fences when frames are dropped" into nyc-mr1-dev am: 60fca42031 am: a60a2731d4
am: 19547e89a2

Change-Id: I361fa54472ea8d44cd884b75bc33eb9d5026b96c
2016-09-02 20:10:19 +00:00
Chris Craik
a789dd2510 Merge "Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9" into nyc-mr1-dev-plus-aosp
am: 2a8df9925b

Change-Id: I3a7c3592828e9d04ff92c1443b7655ae6d17540a
2016-09-02 20:10:10 +00:00
Chris Craik
7cae510f41 Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9
am: b53c60876a

Change-Id: Ib9c5be43f65379770b17260c34be90fccb360277
2016-09-02 20:10:06 +00:00
Bill Yi
9d6f0037a9 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1 -s ours am: 347f2b60b5 -s ours" into nyc-mr1-dev-plus-aosp
am: 571b44289b  -s ours

Change-Id: Ica5c639ce2a02fadfcd74c6417491c1eeb16c88e
2016-09-02 20:03:18 +00:00
Bill Yi
72b880516f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1 -s ours am: 347f2b60b5 -s ours
am: 22eecbe274  -s ours

Change-Id: Ie62d911c8ebdd816b50c39a84cd31d481da089d2
2016-09-02 20:03:13 +00:00
Bill Yi
6bf906c13e Merge "Import translations. DO NOT MERGE am: d341e0f050 -s ours am: 05af4b26b6 -s ours" into nyc-mr1-dev-plus-aosp
am: 2db43d665c  -s ours

Change-Id: Iec05636e87486b380b1aaa28da37a38f7316b2d1
2016-09-02 20:03:00 +00:00
Bill Yi
4ee70506cd Import translations. DO NOT MERGE am: d341e0f050 -s ours am: 05af4b26b6 -s ours
am: d9ae4b7b78  -s ours

Change-Id: I63d17a65eb2a43872d37b1d0ed7db04f45025127
2016-09-02 20:02:55 +00:00
Michael Kwan
57f0149fe9 Merge "Merge "Update normal dark button colour to match UX specs." into cw-f-dev am: 2d5bbf7d92" into nyc-mr1-dev-plus-aosp
am: deb155ab96

Change-Id: I5eecb7dd78048d24c9e2a5ffa2ec6ae1b5f6d20f
2016-09-02 20:02:44 +00:00
Michael Kwan
2ee66d2e1f Merge "Update normal dark button colour to match UX specs." into cw-f-dev am: 2d5bbf7d92
am: 67474b01f1

Change-Id: Ibf039f54097e5987bb92dc2986131a97c901b0f5
2016-09-02 20:02:39 +00:00
Michael Kwan
957138ba91 Merge "Update normal dark button colour to match UX specs. am: 9f175654b3" into nyc-mr1-dev-plus-aosp
am: 82f608c3e0

Change-Id: If5098d6da0171270f4cd234d2480262de845ab27
2016-09-02 20:02:30 +00:00
Michael Kwan
38c2f38567 Update normal dark button colour to match UX specs. am: 9f175654b3
am: 6b07dffd80

Change-Id: Id1bff1a0b116e5b00d3b9479c2e9d91c32382adc
2016-09-02 20:02:25 +00:00
Jason Monk
bb84643f2f Merge "Add branded VPN messages to go along with branded icons am: 802bc6ee06 am: 57bf03152c" into nyc-mr1-dev-plus-aosp
am: 19602e0344

Change-Id: I30f6a5d528f9ad549d0ecdcc1ec6ae2a1f5ebb59
2016-09-02 20:02:16 +00:00
Jason Monk
be14cbf18e Add branded VPN messages to go along with branded icons am: 802bc6ee06 am: 57bf03152c
am: cd72f9a1ce

Change-Id: Iad0153394159f46ef3838087a3749b57d60b3986
2016-09-02 19:59:51 +00:00
Sooraj Sasindran
69f981e9e9 Merge "Expose api to retrieve wakelock information per client" 2016-09-02 18:56:44 +00:00
Adam Lesinski
871f2f5fc2 Merge "AAPT2: Add Inline Complex XML support" 2016-09-02 18:49:46 +00:00
TreeHugger Robot
9af92f3cca Merge "Add optional logging to investigate URI grants." 2016-09-02 18:12:54 +00:00
Bill Yi
c7da0b09da Merge changes from topic 'fb-new-project' into stage-aosp-master am: c3099c0428 am: da42c6999c
am: 5b683ac2f2

Change-Id: I53beb8793d989d7551424d33f70537b3704a6302
2016-09-02 17:54:19 +00:00
Martijn Coenen
4d3afbe34b Move Status to libhidl (DO NOT MERGE) am: d713c4c39e -s ours am: 02679c9c1a
am: b5420d64ef  -s ours

Change-Id: Ia7da86c23c026b0a60a0014a5f9d2cbff09ffbb3
2016-09-02 17:53:49 +00:00
Andreas Huber
4a9f42b4d1 Adds framework support for hidl-gen Java backend. (to support structs) (DO NOT MERGE) am: 54e4578e60 -s ours am: 1598a8bc3d
am: d570ab5dcf  -s ours

Change-Id: Ibc8e467c5aeb82867729c9163fdd2e298920e6a8
2016-09-02 17:52:43 +00:00
Andreas Huber
47453e90e9 Add Bool* APIs to HwParcel (DO NOT MERGE) am: 52073b842f -s ours am: e5331f5ea5
am: f9d094c529  -s ours

Change-Id: I65f3f525cd1450524c9bd3309ecc180dfcb1f2a9
2016-09-02 17:51:44 +00:00
Martijn Coenen
1dc0c8bd0e Link against libhidl for HidlSupport/svcmgr (DO NOT MERGE) am: 83c42506a7 -s ours am: c7a710639d
am: 401a7d8288  -s ours

Change-Id: Ic05162247b603085cc144e82b60a697f641fccda
2016-09-02 17:51:07 +00:00
Andreas Huber
a7bfcdfb49 Support one-way methods in java support for hardware binder (DO NOT MERGE) am: ea2ae56e03 -s ours am: 22b01080cb
am: 4921ae67b5  -s ours

Change-Id: I1b28baaa41ed67b9e8ce1a098c1d4ee76db81860
2016-09-02 17:50:30 +00:00
Yohei Yukawa
cc2a206d92 Fix typos in JavaDoc for InputConnection am: 1ab959a6e0
am: 1a000651d5

Change-Id: Ia5dd58a4c85c871a3bae9536f6571fba9930e64a
2016-09-02 17:50:16 +00:00
Yohei Yukawa
ac503dc4f6 Merge "Also Set IME_FLAG_NO_FULLSCREEN to RemoteEditText" into nyc-mr1-dev am: ede3f3fa27
am: c68332ba4e

Change-Id: Ia1fb15407c1fdfdcddfb0858e8c8b258dd1c6189
2016-09-02 17:50:06 +00:00
Yohei Yukawa
2fbbe67a4e Also Set IME_FLAG_NO_FULLSCREEN to RemoteEditText am: c2166b87b0
am: 6aa02a7bf3

Change-Id: I292c2a3bbe649cf16d7dfd9e430ad9fa5b5bde8b
2016-09-02 17:50:00 +00:00
Svetoslav Ganov
316f65ec28 Merge "White-list grandfathered sync adapters" into nyc-mr1-dev am: a6cb2c2804
am: 5193b3cd22

Change-Id: I2998f294bafc9da84d53e45e4223c5e5ab9b9a5f
2016-09-02 17:49:50 +00:00
Svet Ganov
ae28c1a0a1 White-list grandfathered sync adapters am: 65712b0ad3
am: 8b297cb1b1

Change-Id: I2c597234a2ed1ef1cb404522a601722555b44292
2016-09-02 17:49:40 +00:00
Andreas Huber
ebce462ab6 Initial commit of Java support for hardware binder (DO NOT MERGE) am: 0619b33685 -s ours am: bbbe668594
am: aefc9222ef  -s ours

Change-Id: I5eeca2ddd23a5a777823a374f6ad3b60b17312b8
2016-09-02 17:49:11 +00:00
Android Build Merger (Role)
8924ed0e49 Merge "Canada AGNSS settings update am: ff374d4def am: c742d95455 am: afa17f0708" into nyc-mr1-dev-plus-aosp 2016-09-02 17:46:41 +00:00
Android Build Merger (Role)
624ec720c0 Merge "Merge "Wait on frame work fences when frames are dropped" into nyc-mr1-dev am: 60fca42031 am: a60a2731d4" into nyc-mr1-dev-plus-aosp 2016-09-02 17:46:29 +00:00
Wyatt Riley
363e1adcaa Canada AGNSS settings update am: ff374d4def am: c742d95455
am: afa17f0708

Change-Id: I55369933bdab951d06fb54d8869424b11d42fa42
2016-09-02 17:45:25 +00:00
Chris Craik
19547e89a2 Merge "Wait on frame work fences when frames are dropped" into nyc-mr1-dev am: 60fca42031
am: a60a2731d4

Change-Id: Ia98dd83dc4928f6bc5b26535602bbd2a91575394
2016-09-02 17:45:19 +00:00
Android Build Merger (Role)
2a8df9925b Merge "Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9" into nyc-mr1-dev-plus-aosp 2016-09-02 17:44:16 +00:00
Android Build Merger (Role)
571b44289b Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1 -s ours am: 347f2b60b5 -s ours" into nyc-mr1-dev-plus-aosp 2016-09-02 17:44:04 +00:00
Android Build Merger (Role)
2db43d665c Merge "Import translations. DO NOT MERGE am: d341e0f050 -s ours am: 05af4b26b6 -s ours" into nyc-mr1-dev-plus-aosp 2016-09-02 17:43:53 +00:00
Android Build Merger (Role)
deb155ab96 Merge "Merge "Update normal dark button colour to match UX specs." into cw-f-dev am: 2d5bbf7d92" into nyc-mr1-dev-plus-aosp 2016-09-02 17:43:45 +00:00
Android Build Merger (Role)
82f608c3e0 Merge "Update normal dark button colour to match UX specs. am: 9f175654b3" into nyc-mr1-dev-plus-aosp 2016-09-02 17:43:33 +00:00
Android Build Merger (Role)
19602e0344 Merge "Add branded VPN messages to go along with branded icons am: 802bc6ee06 am: 57bf03152c" into nyc-mr1-dev-plus-aosp 2016-09-02 17:43:21 +00:00
Chris Craik
b53c60876a Wait on frame work fences when frames are dropped am: 06e2e9cf4c
am: 7a14f5aeb9

Change-Id: I9f2159f2f5c8111df0c14e46cc5690cbfab9b7e9
2016-09-02 17:41:57 +00:00
Bill Yi
22eecbe274 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1 -s ours
am: 347f2b60b5  -s ours

Change-Id: Icb948efc3c0408f44a01c16043c80cec307d4f55
2016-09-02 17:41:52 +00:00
Bill Yi
d9ae4b7b78 Import translations. DO NOT MERGE am: d341e0f050 -s ours
am: 05af4b26b6  -s ours

Change-Id: Id48f744b1961f824539a24784b0ff005eb445310
2016-09-02 17:41:49 +00:00
Michael Kwan
67474b01f1 Merge "Update normal dark button colour to match UX specs." into cw-f-dev
am: 2d5bbf7d92

Change-Id: I81f0b5ceaacf3b972fe08fd512b32dd73ecb050d
2016-09-02 17:41:39 +00:00