Commit Graph

4618 Commits

Author SHA1 Message Date
Diego Perez
ca9be759c8 Fix Path_Delegate reset
Path_Delegate.reset was not clearing the last point when called. This
caused some vector drawables that relied on relative position to fail to
render correctly.

Bug: http://b.android.com/91383
Bug: http://b.android.com/203797

Change-Id: Id250ecf8a5a5c66671aa8d3ddd213996f824fd56
(cherry picked from commit d6db7133af7b5aed76d83c17b60b27742608a2df)
2016-06-21 14:48:33 +00:00
Adam Lesinski
32852a575b AAPT2: Use hash map for StringPool indices
Hash map has better locality and average case performance

Change-Id: Ic2d111c3cff1d5c0e7e9cbe36714669e6508c275
2016-06-18 01:10:34 +00:00
Yorke Lee
0933cf3f15 Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am: f33af2285b am: 3d80871032
am: 11e3bf5d30

Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
2016-06-17 20:42:14 +00:00
Yorke Lee
11e3bf5d30 Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b
am: 3d80871032

Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912
2016-06-16 21:27:50 +00: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
Roozbeh Pournader
8566f96668 Remove modifications to emoji data
The previous two changes, I60097cd78f28764d83abe0d12b53e2a7e6c974dc
and Idcc8f1b66014b25758c163d908d34f06011d9927, added code to filter
out two characters that were getting removed from the emoji set. Now
that the upstream Unicode data file removes them (see
Ibfea01280d08df34dcdd03f5121aabd532a6eecc), we can remove the code.

Bug: 26187231
Change-Id: Ib849917d8978da1b24fe5fff17d62ad7c2de963a
2016-06-15 13:23:01 -07:00
Adam Lesinski
5fcfdab573 Merge "Allow uses-library under <application>" into nyc-mr1-dev am: c878fb0cb8
am: b80680af78

* commit 'b80680af787dfb27e5a4b1b0edae8502373c4935':
  Allow uses-library under <application>

Change-Id: I078857ace29f7f35b9efbee99f4278b7c7ba9c9e
2016-06-03 00:44:51 +00:00
Adam Lesinski
b80680af78 Merge "Allow uses-library under <application>" into nyc-mr1-dev
am: c878fb0cb8

* commit 'c878fb0cb8a901aae71d965a57e75e682eb6f67f':
  Allow uses-library under <application>

Change-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667
2016-06-03 00:38:23 +00:00
Adam Lesinski
fee32d4d5f Allow uses-library under <application>
Bug:29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23
2016-06-02 23:57:55 +00:00
Diego Perez
64b185e49d Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c am: 9bb16a480d
am: 5e2de2eb12

* commit '5e2de2eb1221c9dafd260b42c732417cfc2b074f':
  Workaround to display menus for AppCompat themes

Change-Id: I5042125c7797c7534c0c83d2e7370d7c5f70be94
2016-05-25 17:32:33 +00:00
Alan Viverette
5e2de2eb12 Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c
am: 9bb16a480d

* commit '9bb16a480d00d8016f9c1969e136acfecceb802b':
  Workaround to display menus for AppCompat themes

Change-Id: I6fee3d4348e763f1e590b6e49740f3108b702b4e
2016-05-25 16:51:19 +00: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
6cc7426439 Merge "Workaround to display menus for AppCompat themes" into nyc-dev
am: 36cd747bb6

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

Change-Id: I65ce3798aa3fc2d851126d88b3dc1834d05b5393
2016-05-25 16:47:14 +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
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Chih-Hung Hsieh
032dcff201 Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 am: f55c9f7aa6
am: d5bb8487d5

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

Change-Id: I779a9fe55406d460cedc1279e3c056e74787c5bb
2016-05-19 23:39:59 +00: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
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
am: f5a87d86bf

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

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
2016-05-17 01:10:44 +00:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee
am: 33cffe3717

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

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
2016-05-17 01:05:00 +00:00
Wale Ogunwale
273d6e8f56 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: I81250af945c186fbb687bc15ec03a85a019bd6e3
2016-05-17 00:59:36 +00: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
7e4ef1a319 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: a1c905caf3
am: c7aeaff113

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

Change-Id: I188b8ebb263d67c1bdcefcd4e9fedf390a199969
2016-05-16 15:37:39 +00:00
Yohei Yukawa
c7aeaff113 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5
am: a1c905caf3

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

Change-Id: Ifbbbd96c2453a1aa6d933dda6fbd7ebbfdf132a7
2016-05-16 15:34:19 +00: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
6b078fef33 Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
am: cef3337cb5

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

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

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

Change-Id: Icbaa4eb19326d2ec41be78016665553a1b7beef0
2016-05-16 13:33:17 +00:00
Michael Wright
fab894efde Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66
am: 1d10d94396

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

Change-Id: Iefa1290cea72c3ddecb57157e61c39af7ce8383b
2016-05-16 13:29:52 +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
Michael Wright
365eaeef5f Merge "Stop emitting javadoc for @removed attributes." into nyc-dev
am: c4033e7c66

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

Change-Id: If48d0299c6d4d7179a366d902f23ada17315e42c
2016-05-16 13:26:58 +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
      2977eb7b6c
 [2]: I5723f627ce323b0d12bd7b93f5b35fc4d342b50c
      792faa2c16

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
a6dac18922 Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev am: 8fc7ca05e5 am: 04b0d780bc
am: 8f0acaf0f2

* commit '8f0acaf0f28c4bd82b563f6ee0f8f7ae74961957':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: Ib59f534436dba2a455c48165faabf1ce7be0a2b0
2016-05-11 16:04:17 +00:00
Diego Perez
8f0acaf0f2 Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev am: 8fc7ca05e5
am: 04b0d780bc

* commit '04b0d780bc9aea597d50635f610a3018ba8826c4':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: Iaf18869cde4ea7bdb93c8d85e77a5a4a2bc53262
2016-05-11 16:01:35 +00: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
0e5358105d Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev
am: 8fc7ca05e5

* commit '8fc7ca05e5ce3a8774be2abb0742b993431bff63':
  Fix VectorDrawable_Delegate and DrawerLayout

Change-Id: I481fbd2510729ad481030c33918b9b52ad508576
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
Adam Lesinski
33e74b7ece Merge "AAPT2: Add diff command" into nyc-mr1-dev am: 1a1461058e
am: 894f96a117

* commit '894f96a117a9ba942b9486317f6852c7472443a6':
  AAPT2: Add diff command

Change-Id: Ic53915ac3c04d151f55c159a170d46da7a1f6c17
2016-05-11 00:11:55 +00:00
Adam Lesinski
894f96a117 Merge "AAPT2: Add diff command" into nyc-mr1-dev
am: 1a1461058e

* commit '1a1461058e6b5a9be28f01cc0b87900a011ea585':
  AAPT2: Add diff command

Change-Id: If3d31d9cb52cb49e0238d01c5391e25cf36a7222
2016-05-11 00:09:04 +00:00
Adam Lesinski
1a1461058e Merge "AAPT2: Add diff command" into nyc-mr1-dev 2016-05-11 00:03:19 +00:00
Doug Felt
d281a99a23 Merge "Merge "Remove rifle (1F946) from emoji font." into nyc-dev am: 0a9c387847 am: aef572227b" into nyc-mr1-dev-plus-aosp
am: dfaa166682

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

Change-Id: Ib177fabc91c761cb45f1f5f55ce3dcb75ef79e79
2016-05-10 21:40:37 +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
4d1cd18333 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac
am: 45c6eb2164

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

Change-Id: I08c6f599d36fabb4f52ba23e9794c28203cc65b5
2016-05-05 19:57:27 +00:00