4589 Commits

Author SHA1 Message Date
Colin Cross
9a1a3bcb16 Replace libziparchive-host with libziparchive
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.

Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd
2016-08-26 11:15:17 -07:00
Sergio Giro
d90d8d615a Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
2016-08-25 12:19:12 +02:00
Sergio Giro
8f7b8a1f6c Unicode: specify destination length in utf8_to_utf16 methods
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
2016-08-25 12:04:40 +02:00
Chih-Hung Hsieh
9c0b881c9d Merge "Fix google-explicit-constructor warnings."
am: ea537bf5b3

Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
2016-08-16 02:23:48 +00:00
Treehugger Robot
ea537bf5b3 Merge "Fix google-explicit-constructor warnings." 2016-08-16 02:12:39 +00:00
Chih-Hung Hsieh
21c0f29597 Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
2016-08-15 14:45:02 -07:00
Chih-Hung Hsieh
b3d46b44a3 resolve merge conflicts of 17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
2016-08-12 11:44:16 -07:00
Chih-Hung Hsieh
ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242 Merge "Fix clang-tidy warnings in libs/hwui." 2016-08-11 23:20:47 +00:00
Chih-Hung Hsieh
8bd37ba458 Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
2016-08-11 15:20:10 -07:00
Hans Boehm
c97c9dbd96 Merge "Do not stack allocate RefBase object in AaptAssets::filter"
am: d0197ac340

Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
2016-08-11 17:28:07 +00:00
Hans Boehm
25dfa75ee3 Do not stack allocate RefBase object in AaptAssets::filter
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.

Bug: 30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
2016-08-10 19:56:50 -07:00
Chih-Hung Hsieh
f35c939cd7 Fix clang-tidy warnings in libs/hwui.
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1

Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 23:26:59 +00:00
Dan Willemsen
2005edf642 Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
Use the same name for the static and shared libraries so that the module
definitions can be shared.

Change-Id: I1578ee7044689194ae1baea4d71f1b0e8737505f
2016-07-31 22:48:28 -07:00
Adam Lesinski
a34b917ce0 Merge \"Fix build due to missing abstract method impl\" into nyc-dev
am: aeef7c4748

Change-Id: I9d12601b4db0108f313c1a69ada67c92929f548b
2016-06-22 22:41:52 +00:00
Adam Lesinski
0f5caab576 Fix build due to missing abstract method impl
getDisplay() was added to Context, which needs to be implemented
for BridgeContext.

Bug:28388969
Change-Id: I7b0ffcbbe252403e35f08d3fa40d6b0e4dbf0daa
2016-06-22 13:11:40 -07:00
Yorke Lee
3d80871032 Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
2016-06-16 21:22:22 +00:00
Yorke Lee
0e85247195 Limit global drags to apps targeting SDK 24 and above
Bug: 29127791

Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
2016-06-16 09:35:40 -07:00
Diego Perez
9bb16a480d Merge "Workaround to display menus for AppCompat themes" into nyc-dev
am: 36cd747bb6

* commit '36cd747bb6030c9c19dbab6bdfd85b2106017973':
  Workaround to display menus for AppCompat themes

Change-Id: I5af2f38a8c470c5aca89e91b951c45f7ae91ed3b
2016-05-25 16:47:47 +00:00
Diego Perez
790e5f6c1c Workaround to display menus for AppCompat themes
Layoutlib currently does not implement menus for the support Toolbar.
When it detects that an AppCompat theme is being used, it will try to
use by default the support Toolbar which breaks the display of menus.
This works around the problem by forcing layoutlib
to use the framework toolbar in menu previews (regular activities
won't display the menu if they use AppCompat).

Bug: http://b.android.com/210946
Change-Id: Ic1d162c6d74119ef42895776c3bc3851a9549120
2016-05-24 18:27:35 +01:00
Adam Lesinski
d5bb8487d5 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169
am: f55c9f7aa6

* commit 'f55c9f7aa64660712242705d4e5e89e2191bbf69':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I23f28430cf242be3f77926016626ea3e5705d4ec
2016-05-19 23:34:58 +00:00
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
2016-05-19 15:19:22 -07:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Yohei Yukawa
a1c905caf3 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
  Make IMS#clearInsetOfPreviousIme() reliable.

Change-Id: I76b607cd8086f421fc0d552a348a70fc06aa3d9c
2016-05-16 15:31:05 +00:00
Yohei Yukawa
cef3337cb5 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev 2016-05-16 15:22:21 +00:00
Michael Wright
1d10d94396 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev
am: c4033e7c66

* commit 'c4033e7c668abc1e671a130f70f58f885c63b176':
  Stop emitting javadoc for @removed attributes.

Change-Id: I7acaaf955f17be180cf311e8a265583cc5a938c6
2016-05-16 13:27:01 +00:00
TreeHugger Robot
c4033e7c66 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev 2016-05-16 13:21:10 +00:00
Yohei Yukawa
833bdcedce Make IMS#clearInsetOfPreviousIme() reliable.
This is a follow-up to my previous CL [1] for Bug 15922840 so that we
can clear the following variables in a more reliable way.
 - PhoneWindowManager#mLastInputMethodWindow
 - PhoneWindowManager#mLastInputMethodTargetWindow

The idea behind CL [2] is that when InputMethodManagerService (IMMS) is
switching from an IME to another IME, IMMS can send a signal to
WindowManagerService (WMS) to remember the current IME's inset so that
the system can continue using it to reduce jank until the new inset is
specified by the next IME.  As summarized in Bug 28781358, however, if
the next IME does not show the window after the IME switch, WMS (or
PhoneWindowManager to be precise) keeps using the previous IME's inset
unexpectedly until the new IME shows its window.  All we have seen in
Bug 15922840 and Bug 26663589 fall into this category.

The idea of this CL is just adding a hidden API to InputMethodManager so
that InputMethodService#clearInsetOfPreviousIme() can surely terminate
the IME transition state managed in PhoneWindowManager, rather than
relying on a hack of calling SoftInputWindow#show() and
SoftInputWindow#hide(), which actually does not work for Bug 26663589.

 [1]: Ib04967f39b2529251e4835c42e9f99dba2cf43f2
      2977eb7b6ce82309a1bb1ba4ab698f503cb0388a
 [2]: I5723f627ce323b0d12bd7b93f5b35fc4d342b50c
      792faa2c16d319e874a1d633f964a78266d5f3f2

Note that addressing all the corner cases in [2] still requires lots of
non-trivial change.  Hence this CL focuses only on Bug 26663589 (and
the case we handled in Bug 15922840).

Bug: 26663589
Change-Id: Ib567daa009c1139858dccadcfc6a04465ebecf36
2016-05-15 20:05:56 -07:00
Diego Perez
04b0d780bc Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev
am: 8fc7ca05e5

* commit '8fc7ca05e5ce3a8774be2abb0742b993431bff63':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: I2c438e5236346a2fa7147b7a9a88eaa2f4a67993
2016-05-11 15:59:03 +00:00
Diego Perez
8fc7ca05e5 Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev 2016-05-11 15:53:15 +00:00
Doug Felt
aef572227b Merge "Remove rifle (1F946) from emoji font." into nyc-dev
am: 0a9c387847

* commit '0a9c387847db52dfcfbb134916f51211560a290c':
  Remove rifle (1F946) from emoji font.

Change-Id: Ic6c87fb2b3b84dbe01c9681a1af11ae57e39e6a2
2016-05-10 21:28:30 +00:00
Doug Felt
3a64f8140c Remove rifle (1F946) from emoji font.
Bug: 28678310
Change-Id: I60097cd78f28764d83abe0d12b53e2a7e6c974dc
2016-05-10 12:50:25 -07:00
Diego Perez
5ca21e4cec Fix VectorDrawable_Delegate and DrawerLayout
Modify the nDraw call that has been changed in the framework to return
an int with the number of pixels allocated.
Modify the animation initialization render call to use the actual
measured size (instead of 0,0) so the DrawerLayout is setup
correctly.

Change-Id: I198de05206382c6489056f7c3d9a1d328864321c
2016-05-10 15:21:38 +01:00
Michael Wright
feaf99fa1b Stop emitting javadoc for @removed attributes.
We need the attributes to remain public because people might still be
linking against them, but we don't want them showing up in the
documentation any more. Them showing up in the documentation also had
the side effect that it would accidentally mark the parent class of
attributes as @removed, which was not intended.

Bug: 28663748

Change-Id: I2f6eb09455fddf1086e6b24bc3bea5292e8e32b7
2016-05-09 14:51:41 +01:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Diego Perez
e8498819f8 Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
am: e37ecbdede

* commit 'e37ecbdede9bb3b4fadba359891b13eb5cd6c697':
  Add missing delegate in Bitmap_Delegate

Change-Id: Ib8e9fd1772a605ba75ffd7cf868fa654c50cb1e5
2016-05-05 12:27:45 +00:00
Diego Perez
e37ecbdede Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev 2016-05-05 12:21:35 +00:00
Robert Carr
77bdfb512f Prepare to replace windows across recreate().
When the activity locally recreates itself, nothing
on the server side is able to prepare preserving windows,
or replacing windows. The activity was trying to defer
removing the old window, but it was just waiting
until the new one was created, not until it was drawn,
thus resulting in a flicker. It's easy to backpack on the
existing replacement infrastructure.

Bug: 28221875
Change-Id: I55fc4ca78e9e11809473fedd8b30b6a6350cf852
2016-05-04 12:40:39 -07:00
Doug Felt
e13a3252f9 Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev
am: 398342f9b6

* commit '398342f9b66046582eff7d98e252d435475d6a92':
  Patch fontchain_lint to exclude modern_pentathlon.

Change-Id: I7bdd78e1fef0f3debdfd97d7c742a4d0987101e1
2016-04-29 21:30:45 +00:00
Raph Levien
398342f9b6 Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev 2016-04-29 21:25:20 +00:00
Doug Felt
ce51db00ec Patch fontchain_lint to exclude modern_pentathlon.
Fix build breakage.
Bug: 28426800

Change-Id: Idcc8f1b66014b25758c163d908d34f06011d9927
2016-04-29 14:17:57 -07:00
Deepanshu Gupta
5d76be778b Merge "Add namespace before attr name in defPropMap" into nyc-dev
am: 4c5e7a740a

* commit '4c5e7a740a632829b48b2324f80a43ab94ac7551':
  Add namespace before attr name in defPropMap

Change-Id: I93619d0e2a28ef30b43e1fe8361142da3122cdda
2016-04-29 20:10:34 +00:00
Deepanshu Gupta
ba4b9ab111 Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev
am: 2385e2184a

* commit '2385e2184a68318a582f075bcd483baa35c776b4':
  Revert "Switch LayoutLib to Java 8"

Change-Id: Ie231af95e2d2361419db0ffc03c3abff4c6f1cc3
2016-04-29 20:10:29 +00:00
Deepanshu Gupta
4c5e7a740a Merge "Add namespace before attr name in defPropMap" into nyc-dev 2016-04-29 20:06:01 +00:00
Deepanshu Gupta
2385e2184a Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev 2016-04-29 20:05:39 +00:00
Rohit Agrawal
ab45664130 Merge "AAPT: ProGuard config for components in main dex." into nyc-dev 2016-04-29 01:19:08 +00:00
Adam Lesinski
0d9f32da56 Merge "AAPT: ProGuard config for components in main dex." am: da66fa7526
am: 1d58c18081

* commit '1d58c18081a2f17afc964de2f261a699e11d6f02':
  AAPT: ProGuard config for components in main dex.

Change-Id: I156e1805ad64798be891747a81561589d9543424
2016-04-28 20:18:21 +00:00