222967 Commits

Author SHA1 Message Date
Filip Gruszczynski
83b41adbca Merge "Revert "Destroy docked divider surface when it's hidden."" 2015-11-25 23:20:25 +00:00
Filip Gruszczynski
19723a4a2b Revert "Destroy docked divider surface when it's hidden."
This reverts commit cb5f57bc580d7f73b93c8f504daa4dcd74cdce72.

Change-Id: I1f77e1ccd5382ed57b8e4165afd79db5223f51c1
2015-11-25 15:13:46 -08:00
Yohei Yukawa
e6af03a38b Merge "Fix build breakage in BridgeIInputMethodManager." 2015-11-25 22:33:49 +00:00
Yohei Yukawa
c428d4742d Fix build breakage in BridgeIInputMethodManager.
This is a follow up CL for 35d3f37bd51268cc99d81a3f537ac364d178e851 [1],
which changed some method signatures of IInputMethodManager.

  [1]: Ia1fe120af7d71495c5f3a4fc0ec6390efb8240ca

We need to update BridgeIInputMethodManager.java every time when we
change IInputMethodManager.

Bug: 25373872
Change-Id: I126dc4234f921039a9d29010ea411a0a7d2ef6c6
2015-11-25 14:21:01 -08:00
Chris Craik
9b9eca5cc5 Merge "Support projection in OpReorderer" 2015-11-25 22:14:42 +00:00
Tony Mak
befb4d7c18 Merge "Allow to specify which user the call should be inserted to" 2015-11-25 22:10:26 +00:00
Chris Craik
8d1f2120fe Support projection in OpReorderer
bug:22480459

Change-Id: Iceb71732dc50957cfb47fa1ba9b8e18e6fc51132
2015-11-25 14:09:24 -08:00
Tony Mak
ce759a1a31 Allow to specify which user the call should be inserted to
Two changes:
1. Allow to specify which user the call is inserted to
2. Store addForAllUsers in call, so that we do not need to copy every call

Change-Id: I8fc9e8e4f2e0bdb0049ca2914fdf8908f62b3eb2
2015-11-25 21:55:52 +00:00
Makoto Onuki
d85eec87c2 Merge "Don't call DPM from UserManager to avoid lock inversion" 2015-11-25 21:51:19 +00:00
Chris Craik
f20528b404 Merge "Move BakedOpDispatcher to separate file" 2015-11-25 21:38:56 +00:00
Chris Craik
9e7fcfda28 Move BakedOpDispatcher to separate file
Change-Id: If7aad6db6b7e54a33eac9b9eddbe8cd844207282
2015-11-25 13:27:33 -08:00
Chad Brubaker
2075a3ebc0 Make NetworkSecurityConfigProvider.install lazy
This defers looking up the meta-data from the install call to when the
rest of the config is lazily initialized.

Change-Id: I008a86f885e158ebe06a2bacdc358cd217635d05
2015-11-25 13:15:59 -08:00
Chad Brubaker
4148b1af0c Merge "Implement checkClientTrusted" am: 8e19803a6a am: a4a6cf9b51
am: 52ae900a29

* commit '52ae900a291844b6454fdb5f9edf65abb95c6fa9':
  Implement checkClientTrusted
2015-11-25 20:55:01 +00:00
Chris Craik
e60d5cc3be Merge "Fix RecordingCanvas::refPaint, add tests" 2015-11-25 20:51:47 +00:00
Chad Brubaker
52ae900a29 Merge "Implement checkClientTrusted" am: 8e19803a6a
am: a4a6cf9b51

* commit 'a4a6cf9b51e903087e2c7f77f2dcb814a0b43fb8':
  Implement checkClientTrusted
2015-11-25 20:48:25 +00:00
Chad Brubaker
a4a6cf9b51 Merge "Implement checkClientTrusted"
am: 8e19803a6a

* commit '8e19803a6a10ac44ca59cf15a2ae1f2eedb13cf8':
  Implement checkClientTrusted
2015-11-25 20:41:03 +00:00
Yohei Yukawa
0466206a6a Merge "Tell the reason why IMM called startInput()." 2015-11-25 20:36:13 +00:00
Chad Brubaker
8e19803a6a Merge "Implement checkClientTrusted" 2015-11-25 20:33:31 +00:00
Chad Brubaker
bdd13f02bc Implement checkClientTrusted
Bug: 25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
2015-11-25 12:22:06 -08:00
Winson
387aac6ad7 Fixing task view heights in paging tasks
- Now, all task views will be bounded by the stack rect, and the 
  thumbnail bitmaps will be scaled accordingly to fit either by width
  (when stacked) or to the view rect (when freeform)
- Fixing issue where the history button was not offset in freeform
- Tweaking thumbnail sizes of fullscreen screenshots
- Still requires changes to fix clipping to the correct aspect ratio in
  freeform.

Change-Id: I678b87c2f06947d32f3bb7c60a35f28eb36b5a68
2015-11-25 19:45:51 +00:00
Winson
250608a5cd Separating the stack vs the historical tasks.
- Adding a notion of session to the stack.  If the history is enabled,
  the stack will now be constrained to show either tasks that were last 
  active in a window of time, or a minimum number of tasks.
- Giving the history button the full space above the stack so that it 
  looks more balanced.

Change-Id: If7b647349e8bb164ae86fd6dba3f7e974257eb5b
2015-11-25 19:43:58 +00:00
Winson Chung
5ac33e194f Merge "Adding history view." 2015-11-25 19:43:10 +00:00
Winson
c29ff0025b Adding history view.
- Initial changes to show a history view within Overview (behind tuner
  flag)
- Restoring the task view dim in the stack

Change-Id: I0503d11768736c86f3145942404391dfacd0ddd6
2015-11-25 11:42:19 -08:00
Alan Viverette
ca98419f77 Avoid concurrent modification for pending partial layout views
Bug: 25871867
Change-Id: I696a441704bad65203633bd34dafc7a56162007a
2015-11-25 14:41:46 -05:00
Alex Klyubin
7b0b9a1351 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am: e766e399c5 am: 4bc1904119
am: 0540e1b127

* commit '0540e1b127e03ecc97c32719ac79769d69c16aec':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
2015-11-25 19:23:55 +00:00
Jim Kaye
fe341d4350 Merge "Extend the \'qwerty\' key layout" am: 9a83f115ad am: e579edc76b
am: b159adb4a8

* commit 'b159adb4a89de42156537294b39d163c26d04d88':
  Extend the 'qwerty' key layout
2015-11-25 19:22:37 +00:00
Sergio Giro
05455443f0 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am: d5a5d547d0 am: d9942006e4
am: dd52b3db36

* commit 'dd52b3db3678dc0840b82f5406d445cea59d2b59':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
2015-11-25 19:21:11 +00:00
Makoto Onuki
e7927da1b6 Don't call DPM from UserManager to avoid lock inversion
- Also make sure DPMS.mOwners is always guarded with DPMS.this.
(and remove synchronization from Owners.)

Bug 25796840

Change-Id: I83f7b78e7b437d9c2a2b1d6e714346cd15f95330
2015-11-25 11:17:08 -08:00
Alex Klyubin
0540e1b127 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am: e766e399c5
am: 4bc1904119

* commit '4bc1904119875dd0e8c63f87106e8ab293cc9a7a':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
2015-11-25 19:13:21 +00:00
Filip Gruszczynski
687789bebf Merge "Only create surface when showing window if it destroys it when hiding." 2015-11-25 19:09:21 +00:00
Filip Gruszczynski
3782797a2a Merge "Don't preserve the window on client side when pinning activity." 2015-11-25 19:09:06 +00:00
Yohei Yukawa
35d3f37bd5 Tell the reason why IMM called startInput().
As a preparation to fix Bug 25373872, this CL introduces an additional
int parameter into the following two methods
  - IInputMethodManager.startInput()
  - IInputMethodManager.windowGainedFocus()
so that IMMS can know why IMM needs to start input.  Currently the
"startInputReason" parameter is used only for debug message only when
the OS is rebuilt with flipping IMMS#DEBUG to true.  Basically this
should have no impact in production builds except for a tiny overhead
of having one int parameter in some internal IPC calls.

Note that since 7663d80f6b6fd6ca7a736c3802013a09c0abdeb9 [1] basically
IMMS#windowGainedFocus() has been a superset of IMMS#startInput().
Hence we should pass to "startInputReason" parameter to
IMMS#windowGainedFocus() as well as IMMS#startInput().

  [1]: Icb58bef75ef4bf9979f3e2ba88cea20db2e2c3fb

Bug: 25373872
Change-Id: Ia1fe120af7d71495c5f3a4fc0ec6390efb8240ca
2015-11-25 11:07:19 -08:00
Alex Klyubin
4bc1904119 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
am: e766e399c5

* commit 'e766e399c59669156284c330ae3f38f79230d930':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
2015-11-25 19:05:09 +00:00
Alex Klyubin
e766e399c5 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." 2015-11-25 18:59:35 +00:00
Filip Gruszczynski
55149303d1 Only create surface when showing window if it destroys it when hiding.
The visibility of a window might be toggled to true even when it doesn't
have a surface, which is a case for windows under the lock screen. We
can't blindly create surfaces in that case, but only do it for the
windows that destroy their surfaces when they are hidden.

Bug: 25879215
Change-Id: I6cf2c6810ce02fba0d2207a56de9924c0270dfeb
2015-11-25 10:51:25 -08:00
Nick Kralevich
18f11bc0f7 Merge "AndroidManifest.xml: More protected broadcasts" 2015-11-25 17:43:39 +00:00
Nick Kralevich
a3ecf45fd9 AndroidManifest.xml: More protected broadcasts
Make the following broadcasts protected:

  android.intent.action.PRE_BOOT_COMPLETED
  android.intent.action.USER_INITIALIZE

Bug: 25022002
Change-Id: Ic36e29c51b930e4d7367688ab837c6a40d74ec23
2015-11-25 09:09:47 -08:00
Geoff Mendal
9fc3cfae5e Merge "Import translations. DO NOT MERGE" 2015-11-25 16:58:13 +00:00
Geoff Mendal
d468ccc61b Import translations. DO NOT MERGE
Change-Id: I340c618b73e1bb95d54fa6d5d9404b33c37f3764
Auto-generated-cl: translation import
2015-11-25 17:47:48 +01:00
Sergio Giro
e38bdf6bf7 ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier, needed by framework/base

DistinguishedNameParser taken from libcore, commit a5c16db453098d7ab945edd379a

This commit was adapted from commit 50dc0c27ff00bfd82fb9cce1c86312efa550170f

Not cherrypicking from dev branch as the original CL to do it went wrong
and would need to cherrypick more changes

Change-Id: I1c282b731c778a79775d9d54b7b7d7223d84397d
2015-11-25 15:25:29 +00:00
Michael Wright
1c8e95167b Merge "Add new TestApi annotation." 2015-11-25 14:12:22 +00:00
Geoff Mendal
87c6aefba5 Merge "Import translations. DO NOT MERGE" 2015-11-25 13:50:24 +00:00
Geoff Mendal
2dac6ccaa6 Import translations. DO NOT MERGE
Change-Id: Iec73269d9960af59bddd9ed0189fea144526850c
Auto-generated-cl: translation import
2015-11-25 05:48:34 -08:00
Geoff Mendal
92eda4fd29 Merge "Import translations. DO NOT MERGE" 2015-11-25 13:37:42 +00:00
Geoff Mendal
0634fbb334 Import translations. DO NOT MERGE
Change-Id: I8ab271a3bfdd0b4d4917cc21234b70b79063e3cf
Auto-generated-cl: translation import
2015-11-25 05:37:11 -08:00
Geoff Mendal
cb37f2566e Import translations. DO NOT MERGE
Change-Id: Iede8cc7c1f459d1f3506dce88dc435c7b5f85ee7
Auto-generated-cl: translation import
2015-11-25 05:18:41 -08:00
Michael Wright
b2b2c0e7d0 Add new TestApi annotation.
This allows us to build a special jar with methods exposed strictly
for CTS. An @TestApi should not be a public API or a system
API.

Bug: 25608286

Change-Id: Ifbc64bb6958d2deec5b9cf0b944acfd068f0f051
2015-11-25 13:01:03 +00:00
Neil Fuller
7ff6e9e7e8 Merge "Add ICU4J APIs for Android" 2015-11-25 09:38:08 +00:00
Lorenzo Colitti
2a2f855c4d Merge "Make the new NetworkRequest flavour consistent with the others." 2015-11-25 07:46:31 +00:00
Keisuke Kuroyanagi
877a4e09ea Merge "Selection Test: selection handle snaps to word boundaries." 2015-11-25 07:37:29 +00:00