Commit Graph

4595 Commits

Author SHA1 Message Date
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
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
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
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
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
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
5dc82fad17 Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede am: e8498819f8
am: 9e1287f989

* commit '9e1287f9890dc40d46444a4447c90473f621f0f8':
  Add missing delegate in Bitmap_Delegate

Change-Id: Ie05e3eea7fa2ba62df504a0d8b15c2c4629ff650
2016-05-05 12:32:47 +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
Chih-Hung Hsieh
d53e3bed1c Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I080090d50f1a368a4e7c1a0732297bb6a295e34f
2016-05-03 10:02:51 -07:00
Adam Lesinski
458b877488 AAPT2: Add diff command
Adds the diff command and various small fixes to issues
discovered when diffing old AAPT built APKs with new AAPT2
built APKS.

Bug:22775504
Change-Id: I682a7fe1cf4b3efa7cbd5d18b333cf2d1046fe1b
2016-04-30 01:36:12 +00:00
Doug Felt
c3dbfc397c Merge "Patch fontchain_lint to exclude modern_pentathlon." into nyc-dev am: 398342f9b6 am: e13a3252f9
am: 3195fab770

* commit '3195fab770a480ac621fb9908213183688e4f627':
  Patch fontchain_lint to exclude modern_pentathlon.

Change-Id: I7f68560bbd64bbcbb0b7c7de4d295477ed61fd7c
2016-04-29 21:35:12 +00: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
836bbe9fa6 Merge "Add namespace before attr name in defPropMap" into nyc-dev am: 4c5e7a740a am: e47c4aec7d
am: 6291e0ba4f

* commit '6291e0ba4f5cbee39ad70cdbd27117bdad531797':
  Add namespace before attr name in defPropMap

Change-Id: Ib1c40ddd52c42da023abff277379e908509778f0
2016-04-29 20:17:49 +00:00
Deepanshu Gupta
40631eeca8 Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev am: 2385e2184a am: f3cdbe2254
am: f593ca4d3d

* commit 'f593ca4d3d15d1c3f57d2d54f9cb250c23f4f90e':
  Revert "Switch LayoutLib to Java 8"

Change-Id: I899ace3ef0e6856320141de0471d88a7eab78e7a
2016-04-29 20:17:41 +00:00
Deepanshu Gupta
6291e0ba4f Merge "Add namespace before attr name in defPropMap" into nyc-dev am: 4c5e7a740a
am: e47c4aec7d

* commit 'e47c4aec7d8e1ab2d0c30c95b3951a8e2367a4b2':
  Add namespace before attr name in defPropMap

Change-Id: I4acb3c65e3e0012fed50b2571fede7504ec42a86
2016-04-29 20:12:53 +00:00
Deepanshu Gupta
f593ca4d3d Merge "Revert "Switch LayoutLib to Java 8"" into nyc-dev am: 2385e2184a
am: f3cdbe2254

* commit 'f3cdbe22540ddc692adef7e00b30b75ac38d22f8':
  Revert "Switch LayoutLib to Java 8"

Change-Id: I2b97993e7f6803e0352d1734db74891bee0b75d7
2016-04-29 20:12:50 +00: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
Adam Lesinski
da66fa7526 Merge "AAPT: ProGuard config for components in main dex." 2016-04-28 20:06:19 +00:00