Commit Graph

57754 Commits

Author SHA1 Message Date
Wale Ogunwale
f33eb79eb5 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev am: ddfc6f7
am: ff064a4

* commit 'ff064a4679c68c8553be6776f5b81a11f3318790':
  Show non-top tasks in the docked stack in recents.
2016-03-28 21:17:51 +00:00
Tao Bao
c0d4b37a16 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev am: 9971d02
am: 85b0ba3

* commit '85b0ba3cc369cc5106a5368434524ae479dfa00d':
  UpdateEngine: Add resetStatus() as system API.
2016-03-28 21:17:04 +00:00
Brad Ebinger
7fde28455a Merge "Add VIA number column to CallLog Database" into nyc-dev am: 900f163
am: ca3c301

* commit 'ca3c3012df230e0c49906e18fdea93992d6313b2':
  Add VIA number column to CallLog Database
2016-03-28 21:16:01 +00:00
Chad Brubaker
8a549ff056 Merge "Use X509ExtendedTrustManagers" into nyc-dev am: 12da920
am: 71ea966

* commit '71ea9666d80bed95d1c2bfff6e063db03a78e23b':
  Use X509ExtendedTrustManagers
2016-03-28 21:14:58 +00:00
Yigit Boyar
41b29bd32d Merge "Recover focus on size change in ListView" into nyc-dev am: e082735
am: e46e7fb

* commit 'e46e7fbde9bd6c16efc1a2fdee554b73afa7d124':
  Recover focus on size change in ListView
2016-03-28 21:14:16 +00:00
Yohei Yukawa
4c5d6e5eb7 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev am: feade80
am: ab0dbb1

* commit 'ab0dbb1d53a4b85098129beae034a6515f8dc935':
  Dump more info for View when IMM#DEBUG is true.
2016-03-28 21:13:01 +00:00
Yohei Yukawa
a6e08639cc Merge "Clean-up a workaround that is no longer necessary." into nyc-dev am: 207d325
am: 34b4ff2

* commit '34b4ff24a052c92cb8425d5a251874c9b285e99e':
  Clean-up a workaround that is no longer necessary.
2016-03-28 21:12:32 +00:00
Eino-Ville Talvala
2c72580d2c Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev am: 8c349f5
am: 6da63cf

* commit '6da63cfb19be997671419fe8773d1f8f0ddd67d5':
  Camera: Add bandaid for preview orientation on reverse-landscape cameras
2016-03-28 21:10:15 +00:00
Wale Ogunwale
ff064a4679 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev
am: ddfc6f7

* commit 'ddfc6f7dc9e2b2a5b5c2cab033bf894c5cf1a59b':
  Show non-top tasks in the docked stack in recents.
2016-03-28 21:06:04 +00:00
Tao Bao
85b0ba3cc3 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev
am: 9971d02

* commit '9971d02c38151a4289552d5b1cfb7b3c7c0acec6':
  UpdateEngine: Add resetStatus() as system API.
2016-03-28 21:05:36 +00:00
Brad Ebinger
ca3c3012df Merge "Add VIA number column to CallLog Database" into nyc-dev
am: 900f163

* commit '900f1635c021b022243049e2401ef04ad554465f':
  Add VIA number column to CallLog Database
2016-03-28 21:05:11 +00:00
Chad Brubaker
71ea9666d8 Merge "Use X509ExtendedTrustManagers" into nyc-dev
am: 12da920

* commit '12da920fa41eef7b28b14b4ae9af06212c77da4b':
  Use X509ExtendedTrustManagers
2016-03-28 21:05:04 +00:00
Yigit Boyar
e46e7fbde9 Merge "Recover focus on size change in ListView" into nyc-dev
am: e082735

* commit 'e0827355a5ca89188ed16f6df7db930aa964be4f':
  Recover focus on size change in ListView
2016-03-28 21:04:56 +00:00
Yohei Yukawa
ab0dbb1d53 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev
am: feade80

* commit 'feade806098a0fe6bc53e1a531dedb6af13fac57':
  Dump more info for View when IMM#DEBUG is true.
2016-03-28 21:03:43 +00:00
Yohei Yukawa
34b4ff24a0 Merge "Clean-up a workaround that is no longer necessary." into nyc-dev
am: 207d325

* commit '207d325c52b94f61a4ad645597fe88ef7374708d':
  Clean-up a workaround that is no longer necessary.
2016-03-28 21:03:11 +00:00
Eino-Ville Talvala
6da63cfb19 Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev
am: 8c349f5

* commit '8c349f5d3b764d4ab726070dba397a2a292a6858':
  Camera: Add bandaid for preview orientation on reverse-landscape cameras
2016-03-28 21:02:27 +00:00
Wale Ogunwale
ddfc6f7dc9 Merge "Show non-top tasks in the docked stack in recents." into nyc-dev 2016-03-28 20:22:35 +00:00
Tao Bao
9971d02c38 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 2016-03-28 19:51:36 +00:00
Brad Ebinger
900f1635c0 Merge "Add VIA number column to CallLog Database" into nyc-dev 2016-03-28 19:27:20 +00:00
Chad Brubaker
12da920fa4 Merge "Use X509ExtendedTrustManagers" into nyc-dev 2016-03-28 19:14:23 +00:00
Yigit Boyar
e0827355a5 Merge "Recover focus on size change in ListView" into nyc-dev 2016-03-28 19:10:08 +00:00
Wale Ogunwale
64ae08aa16 Show non-top tasks in the docked stack in recents.
Allows the user to access the task through recents since
it isn't currently visible on screen.

Also, changed recents to launch task currently in the docked
stack in the fullscreen stack when selected from recents list.

Bug: 27864383
Change-Id: I58549023920d064a30b6355367c3193ce3207bbd
2016-03-28 12:06:44 -07:00
Yohei Yukawa
feade80609 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev 2016-03-28 18:20:56 +00:00
Yohei Yukawa
207d325c52 Merge "Clean-up a workaround that is no longer necessary." into nyc-dev 2016-03-28 17:55:26 +00:00
Chad Brubaker
0f5d386a76 Use X509ExtendedTrustManagers
Move the X509TrustManagers for the Network Security Config from
X509TrustManagers to X509ExtendedTrustManagers.

Bug: 27271561
Change-Id: I084a6c6022fe69730192d2bdcbabaf58e8f92f04
2016-03-28 10:48:41 -07:00
Eino-Ville Talvala
8c349f5d3b Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev 2016-03-28 17:47:20 +00:00
George Mount
d1fe045611 Merge "If resume occurs, force finish of exiting activity." into nyc-dev am: fe77fdf
am: e4f870a

* commit 'e4f870a14eae83095e7ab170e9770a76b3de5475':
  If resume occurs, force finish of exiting activity.
2016-03-28 17:29:23 +00:00
George Mount
5cf657ce0b Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev am: 20d51f5
am: b031fef

* commit 'b031fef2ecf947b1f2dcbf01cc4926a0db24014f':
  Disable suppressLayout in Visibility Activity Transitoins.
2016-03-28 17:29:21 +00:00
George Mount
e4f870a14e Merge "If resume occurs, force finish of exiting activity." into nyc-dev
am: fe77fdf

* commit 'fe77fdf8b35d6893e7d96c9b8eeb77c4eb16980a':
  If resume occurs, force finish of exiting activity.
2016-03-28 17:25:35 +00:00
George Mount
b031fef2ec Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev
am: 20d51f5

* commit '20d51f550f1e134feb74dc7c23aa5f29f7062685':
  Disable suppressLayout in Visibility Activity Transitoins.
2016-03-28 17:25:33 +00:00
George Mount
fe77fdf8b3 Merge "If resume occurs, force finish of exiting activity." into nyc-dev 2016-03-28 17:21:11 +00:00
George Mount
20d51f550f Merge "Disable suppressLayout in Visibility Activity Transitoins." into nyc-dev 2016-03-28 17:20:53 +00:00
Yigit Boyar
0363341f6c Recover focus on size change in ListView
This CL fixes a bug in ListView where if items are not selectable,
not focusable(in terms of ListView flags) but get focus (because
they can), ListView would not recover the focus properly although
it would make the child visible.

The major issue seems like AbsListView marks data set changed when
the list resizes. It seems like a workaround for some other issue
and the code is from 2009 so instead of changing it, I've decided
to implement a workaround to minimize the potential of breaking
something else.

Bug: 27488391
Change-Id: I5babd00e97bba7cb8cc9cfd0697ef79dfae12b97
2016-03-28 10:09:22 -07:00
Shuo Gao
0d7b69ca01 Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-dev-plus-aosp
am: 8de1bcd

* commit '8de1bcd896c1fab36290edb4c4eba49485d3ab7e':
  Enable shader cache for applications that shared UID with multiple packages too
2016-03-28 16:22:42 +00:00
John Reck
8de1bcd896 Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-dev-plus-aosp 2016-03-28 16:17:10 +00:00
Yohei Yukawa
5c1e6751a5 Dump more info for View when IMM#DEBUG is true.
This is a preparation CL to fix Bug 27858665.  In order to debug issues
like this, we want to record following information about View.
 - Whether the View is focused or not.
 - Whether the Window to which the View belongs is focused or not.
 - Whether the View belongs to a Window or not.

This CL has no impact on production build where IMM#DEBUG is false.

Bug: 18920212
Change-Id: I06bcd5e42d55f96a9e916eb34ed7785cfe14c96f
2016-03-28 01:52:47 -07:00
Yohei Yukawa
241eac21a0 Clean-up a workaround that is no longer necessary.
With the previous commit [1], now Bug 27868748 is fixed and Bug 6789252
is no longer reproducible even without a workaround [2] for that.  Hence
this CL logically reverts [2] in favor of simplicity.

  [1]: If2a03bc84d318775fd4a197fa43acde086eda442
       aaa38c9f1a
  [2]: I66f51da1299532793ef8fa700f35b0811670f235
       4e5184f929

Bug: 27868748
Change-Id: Ic59af43343eb44d1d2c23a3f4018565e7a75b143
2016-03-28 00:28:50 -07:00
Yohei Yukawa
3f838f79df Merge "Ensure IC#finishComposingText() is called on the correct Handler." into nyc-dev am: 9194f34
am: f53bbbc

* commit 'f53bbbc73049ab948649a420ee73ddc2659d8dc5':
  Ensure IC#finishComposingText() is called on the correct Handler.
2016-03-28 06:58:47 +00:00
Yohei Yukawa
f53bbbc730 Merge "Ensure IC#finishComposingText() is called on the correct Handler." into nyc-dev
am: 9194f34

* commit '9194f344b922cd04e5e44206ada6191865631daa':
  Ensure IC#finishComposingText() is called on the correct Handler.
2016-03-28 06:55:07 +00:00
Yohei Yukawa
9194f344b9 Merge "Ensure IC#finishComposingText() is called on the correct Handler." into nyc-dev 2016-03-28 06:47:50 +00:00
Yohei Yukawa
aaa38c9f1a Ensure IC#finishComposingText() is called on the correct Handler.
This attempts to reland previously reverted CLs [1][2] due to an
unexpected regression (Bug 27824691).

The Bug 27868748 we want to address by this CL is that currently
InputConnection#finishComposingText() can be called on the root view's
Handler no matter what Handler is associated with
ControlledInputConnectionWrapper.  Actually the root cause of
Bug 6789252 is the same, but there we worked around it by not calling
InputConnection#finishComposingText() in certain situations [3].
With this CL we should be able to logically revert that workaround.

This CL also removes redundant IMM#mServedInputConnection.  This is safe
because the following two fields have the same lifetime.
 - InputMethodManager#mServedInputConnection
 - InputMethodManager#mServedInputConnectionWrapper
We do not need to maintain both of them.  This also allows us to use a
strong refecente in IInputConnectionWrapper#mInputConnection instead of
a WeakReference.  To understand why this is safe, we need to understand
how things previously worked, which is as follows:

  1. InputMethodManager#mServedInputConnection becomes non-null.
    -> IInputConnectionWrapper#mInputConnection.get() is guaranteed to
       be alive.
  2. InputMethodManager#mServedInputConnection becomes null or another
     object.
    -> IInputConnectionWrapper#mInputConnection.get() may not be alive.

Since we know exactly when InputMethodManager#mServedInputConnection is
updated, in theory we do not need to use WeakReference here, and
with this CL we do not use WeakReference anymore.  Actually the initial
commit [1] accidentally removed the last strong reference to the active
InputConnection and WeakReference could be null at any time, which was
what we observed in Bug 27824691.

  [1]: I1181e067aa5bedbdf0c7ec1bcec479257aea511c
       afb6558c8f
  [2]: Ibe94f115e607a198d12ecd3d4e4f91a7d9469c98
       16e2c7b59a
  [3]: I66f51da1299532793ef8fa700f35b0811670f235
       4e5184f929

Bug: 27868748
Change-Id: If2a03bc84d318775fd4a197fa43acde086eda442
2016-03-27 23:46:04 -07:00
Keisuke Kuroyanagi
cabc670d2c Merge "Improve selection handle behavior for bidi text." into nyc-dev am: 1e632ba
am: 7c90769

* commit '7c90769e94bca613488fae23623bb3ec1a8e92a1':
  Improve selection handle behavior for bidi text.
2016-03-28 06:17:24 +00:00
Keisuke Kuroyanagi
7c90769e94 Merge "Improve selection handle behavior for bidi text." into nyc-dev
am: 1e632ba

* commit '1e632ba426ac3e07b82299505aa32495ebb3c709':
  Improve selection handle behavior for bidi text.
2016-03-28 06:13:56 +00:00
Keisuke Kuroyanagi
1e632ba426 Merge "Improve selection handle behavior for bidi text." into nyc-dev 2016-03-28 06:06:02 +00:00
Jeff Sharkey
9bd527d0f6 Merge "Include "invisible" volumes in new storage API." into nyc-dev am: 4d9b6e4
am: 0f6805e

* commit '0f6805ee0566d170c520610a9b2c0802ae930b62':
  Include "invisible" volumes in new storage API.
2016-03-28 05:49:05 +00:00
Jeff Sharkey
0f6805ee05 Merge "Include "invisible" volumes in new storage API." into nyc-dev
am: 4d9b6e4

* commit '4d9b6e4f5724a4ef2340bc4725b824ca573f474c':
  Include "invisible" volumes in new storage API.
2016-03-28 05:44:44 +00:00
Jeff Sharkey
4d9b6e4f57 Merge "Include "invisible" volumes in new storage API." into nyc-dev 2016-03-28 05:18:40 +00:00
Andrii Kulian
11073cda39 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev am: 47869bd
am: d5afdc7

* commit 'd5afdc71c96960ec9acf405a8ae1222aba48ebf2':
  Update ActivityInfo#WindowLayout apis (1/3)
2016-03-28 00:34:11 +00:00
Andrii Kulian
d5afdc71c9 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev
am: 47869bd

* commit '47869bd446e0de36bdb4848d3c286a15fc3fdbf7':
  Update ActivityInfo#WindowLayout apis (1/3)
2016-03-28 00:31:16 +00:00
Andrii Kulian
47869bd446 Merge "Update ActivityInfo#WindowLayout apis (1/3)" into nyc-dev 2016-03-28 00:25:01 +00:00