Commit Graph

58608 Commits

Author SHA1 Message Date
Yohei Yukawa
a110c56a28 Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev am: 6feeedc
am: 92afb12

* commit '92afb12a7b9a263f9500b87ff48c0a3c8dff5740':
  Revert "Customizes input extract edit view for Wear"

Change-Id: I44bd900c1bd896f71cfcdadfd599a822520a1032
2016-04-10 00:51:08 +00:00
Yohei Yukawa
92afb12a7b Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev
am: 6feeedc

* commit '6feeedc72b582f042986218185877ddda49c867b':
  Revert "Customizes input extract edit view for Wear"

Change-Id: Ic1927a81dd1da61e62eb106a92064cc4c6955277
2016-04-10 00:47:42 +00:00
Yohei Yukawa
757224008e Revert "Customizes input extract edit view for Wear"
This reverts commit 880602eb64 [1],
which was committed with a wrong author email address and lacked license
notice in some files.  To avoid confusion, this we decided to
temporarily revert that CL so that we can commit it with proper license
notice and author address again.

 [1]: I16226ce393f2d15065d08e66a36d008eb1a0c8a1

Bug: 22512982
Bug: 28098677
Change-Id: I3dd3c7bf0ee9634fc4f3bf433bf5023675873e46
2016-04-09 15:24:02 -07:00
Jorim Jaggi
ab037375c3 Merge "Only force drawing status bar background if target >= N" into nyc-dev am: fe52f91
am: fe6cec1

* commit 'fe6cec1ac00a4b60689a774bfef720c3b6f06b61':
  Only force drawing status bar background if target >= N

Change-Id: Iaacf9fb25df6ce08ab0b6fbcf7fcc23b5abfea26
2016-04-09 06:25:57 +00:00
Jack Yu
2890f6053f Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev am: 2e062ab
am: 6754d23

* commit '6754d237bb8c6e1fba779f90417b4a2fe07d2b3e':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I0f37f4d296de88763019f469a0356e753b9f3636
2016-04-09 06:25:54 +00:00
Amith Yamasani
8528648384 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev am: 0cc0381
am: 597965f

* commit '597965f5384b5f4f77ae4ef39e8db799529ab46d':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: Ida3e6c5ce407007955eb1533f13d6465e194937c
2016-04-09 05:58:21 +00:00
Zhijun He
8fcc25dade Merge "Camera2: update API per API council review" into nyc-dev am: b0fe2a9
am: c2ec322

* commit 'c2ec3226ea018e415c57871727c34d44abd80ca4':
  Camera2: update API per API council review

Change-Id: I4ad3be32bee216a92731b07901a661c1ce0463b3
2016-04-09 05:57:41 +00:00
Phil Weaver
44881fb8b2 Merge "Reduce unnecessary accessibility cache clearing." into nyc-dev am: af93306
am: 618fda2

* commit '618fda27082bd184ee031f9a2b9945b7f4aa1cfc':
  Reduce unnecessary accessibility cache clearing.

Change-Id: Ic5ed49358f6dadcbce6fc9bb16b63ec55e8a9b60
2016-04-09 05:57:17 +00:00
Tenghui Zhu
01752ed85b Merge "Update the documentation on createCircularReveal" into nyc-dev am: 3cb5ba7
am: 49de023

* commit '49de023f1bdefc4a1bb604c9ce1665abc9cf0719':
  Update the documentation on createCircularReveal

Change-Id: I3209064f0c2b1614c27e00cf3c454de74385eab6
2016-04-09 05:56:50 +00:00
Bryce Lee
744743a869 Merge "Add granular control over disabled effects." into nyc-dev am: 196a057
am: 931690f

* commit '931690f28a074b3882cdd1c6b7d54a23d74437a6':
  Add granular control over disabled effects.

Change-Id: Ibaf6cfb3f7b6a63b6de2b89a7116b36dfdbe178d
2016-04-09 05:56:02 +00:00
Mark Renouf
e8117a1a1f Merge "Customizes input extract edit view for Wear" into nyc-dev am: 4430308
am: 41178c2

* commit '41178c21c8ef9fabae09d39ba32bd0dcb5e97b43':
  Customizes input extract edit view for Wear

Change-Id: I0d485235c2599c80d313507e03eda4f38a6717c6
2016-04-09 05:55:32 +00:00
Julia Reynolds
c54a7d7b76 Merge "Allow the ranker to autobundle notifications." into nyc-dev am: 3898db9
am: af343d6

* commit 'af343d6796eb0996d134bd606b76b6b2ee5bb185':
  Allow the ranker to autobundle notifications.

Change-Id: I9b5011fa6261d8717db66c5786b51679188f6d8c
2016-04-09 05:53:09 +00:00
Jason Monk
847c7e8c2a Merge "Allow mode of TileService to be changed" into nyc-dev am: aa336f8
am: 1476f35

* commit '1476f3573be229ae00c3a13afb324648305a8bf8':
  Allow mode of TileService to be changed

Change-Id: I8a6b58f4dd2d8bd135e4cadfdc63198720d6e7a8
2016-04-09 05:52:16 +00:00
Dianne Hackborn
15a3cde2a1 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev am: 6827db3
am: 97907066

* commit '97907066c6cf19eb85607798a41a6f002fb4ea1a':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I44ac8048311da7e3ea274b532c25e150e2b044ce
2016-04-09 05:50:53 +00:00
Adam Powell
c72c505b23 Merge "Chooser filtering and caller direct share targets" into nyc-dev am: fe5e1a7
am: a1be176

* commit 'a1be176a42db8dad7dcebca8842b95bbf6cc6bf9':
  Chooser filtering and caller direct share targets

Change-Id: I17d733ef5f6d2381dea3050f666436fbfe185982
2016-04-09 05:50:11 +00:00
Andrii Kulian
04154a27ae Merge "Fix multiple configuration changes in multiwindow" into nyc-dev am: 21400cb
am: d4b770e

* commit 'd4b770e16e875a8c6339c40d90dc27e2791e9631':
  Fix multiple configuration changes in multiwindow

Change-Id: I7c8b421a3437fca2a7dd82ab5cf46b8a0bc06831
2016-04-09 05:49:24 +00:00
Phil Weaver
c0abe7795f Merge "Eliminate side effects of a11y window title." into nyc-dev am: ab4d5ff
am: 9a37547

* commit '9a375470d4e3f3fde29ea5925454f49c6dc84274':
  Eliminate side effects of a11y window title.

Change-Id: I3af7aa51c888a0405a171d81869b9749a6056e33
2016-04-09 05:48:21 +00:00
Jorim Jaggi
fe6cec1ac0 Merge "Only force drawing status bar background if target >= N" into nyc-dev
am: fe52f91

* commit 'fe52f91f0cee39b186b1b892fc3344d3279640cf':
  Only force drawing status bar background if target >= N

Change-Id: I424d896d801dc57ed8e14fce3205644060d33e8e
2016-04-09 04:11:00 +00:00
Jorim Jaggi
fe52f91f0c Merge "Only force drawing status bar background if target >= N" into nyc-dev 2016-04-09 04:04:35 +00:00
Jorim Jaggi
8f5701bd9f Only force drawing status bar background if target >= N
Since forcing it all the time has the potential of breaking
compatibility with apps, we don't want to do this.

Instead, we only force it if the app targets >= N.

We communicate this to window manager with
PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND.

We introduced this for 2-up split-screen. If we have an app
that doesn't draw the status bar background by itself, we
just force the whole bar to be black.

The same applies for windows that used translucent status
bar - we also force the whole bar to be black

Bug: 27285627
Change-Id: I7f1ceaa364f8a4e851935f77aa5e8d913bf11791
2016-04-08 20:49:20 -07:00
Jack Yu
6754d237bb Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
am: 2e062ab

* commit '2e062ab8de3bae82b76a3f3aaeac6994f2555fe5':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I72b09515578a1843009439b1a8fbccccaaf3ab4c
2016-04-09 03:37:54 +00:00
Jack Yu
2e062ab8de Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev 2016-04-09 03:30:31 +00:00
Amith Yamasani
597965f538 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
am: 0cc0381

* commit '0cc0381714f0356dd6cece201265b368fa2706b6':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: I81a9d06e3ce67859f32476f7a5c2c3b87e6f8d4f
2016-04-09 01:43:20 +00:00
Amith Yamasani
0cc0381714 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev 2016-04-09 00:47:23 +00:00
Zhijun He
c2ec3226ea Merge "Camera2: update API per API council review" into nyc-dev
am: b0fe2a9

* commit 'b0fe2a9637dc45ac319af9ab848b034ed4a414d3':
  Camera2: update API per API council review

Change-Id: I86daab40a4cdb957c95509fc33eb2b25e95cad84
2016-04-09 00:43:29 +00:00
Phil Weaver
618fda2708 Merge "Reduce unnecessary accessibility cache clearing." into nyc-dev
am: af93306

* commit 'af93306a3db9c0a04d74809901cc297834bbba87':
  Reduce unnecessary accessibility cache clearing.

Change-Id: Iea1ed7e894d8e4416e5d9c64feb226343036e8f8
2016-04-09 00:43:23 +00:00
Teng-Hui Zhu
49de023f1b Merge "Update the documentation on createCircularReveal" into nyc-dev
am: 3cb5ba7

* commit '3cb5ba75b76dedc7a468d324e7875e805555827f':
  Update the documentation on createCircularReveal

Change-Id: I6048e88341b908c1cefc36e424c2182521116a69
2016-04-09 00:43:15 +00:00
Bryce Lee
931690f28a Merge "Add granular control over disabled effects." into nyc-dev
am: 196a057

* commit '196a05724d73832571c6e4ad5372b05840ec041f':
  Add granular control over disabled effects.

Change-Id: I453928754c89113f321df08a4ca8612660b1012c
2016-04-09 00:42:38 +00:00
Mark Renouf
41178c21c8 Merge "Customizes input extract edit view for Wear" into nyc-dev
am: 4430308

* commit '44303087cc4d8a0830b14a87c2b7f32a39e9080b':
  Customizes input extract edit view for Wear

Change-Id: Ic3fba9b190ca762a9e0ff60a705a1cb132cf7dec
2016-04-09 00:42:27 +00:00
Julia Reynolds
af343d6796 Merge "Allow the ranker to autobundle notifications." into nyc-dev
am: 3898db9

* commit '3898db9e152ff8e2b34ae97f4a2ed37b9cb667db':
  Allow the ranker to autobundle notifications.

Change-Id: I652a43365b8eee51e91ed1c5d22aacb1b488e373
2016-04-09 00:41:35 +00:00
Jason Monk
1476f3573b Merge "Allow mode of TileService to be changed" into nyc-dev
am: aa336f8

* commit 'aa336f89265b8936d23e43189904de6ea9575538':
  Allow mode of TileService to be changed

Change-Id: Ia48acae4fb65f123755bc7c73b6d8204435f4d16
2016-04-09 00:41:23 +00:00
Dianne Hackborn
97907066c6 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev
am: 6827db3

* commit '6827db3e5fccb5185009ad5ac6a9e30d17573bf2':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I0112842918f713cbf30d061f82dcdfa4e8c084ca
2016-04-09 00:40:37 +00:00
Adam Powell
a1be176a42 Merge "Chooser filtering and caller direct share targets" into nyc-dev
am: fe5e1a7

* commit 'fe5e1a75c125095b90719b22ffcf71e0968a6530':
  Chooser filtering and caller direct share targets

Change-Id: I8be4c3a825632be9e621ba542877d484d0b2b7f8
2016-04-09 00:40:08 +00:00
Andrii Kulian
d4b770e16e Merge "Fix multiple configuration changes in multiwindow" into nyc-dev
am: 21400cb

* commit '21400cb552f5dc7f4c8296be53fabaa46b03fa85':
  Fix multiple configuration changes in multiwindow

Change-Id: I01db63f6b8899ad04fad72b759611a550b3b42ac
2016-04-09 00:39:52 +00:00
Phil Weaver
9a375470d4 Merge "Eliminate side effects of a11y window title." into nyc-dev
am: ab4d5ff

* commit 'ab4d5ffd123433d434a8c4e1f3bf2674d99a5fb3':
  Eliminate side effects of a11y window title.

Change-Id: I388abfd86355bc90df4ee3b788bda0a6cd494f81
2016-04-09 00:39:20 +00:00
Zhijun He
b0fe2a9637 Merge "Camera2: update API per API council review" into nyc-dev 2016-04-08 23:30:41 +00:00
Zhijun He
0034743236 Camera2: update API per API council review
Per API concil recommendation, made below API change:
* change method name from createCaptureSessionByOutputConfiguration to
createCaptureSessionByOutputConfigurations
* Change method name from
createReprocessableCaptureSessionWithConfigurations to
createReprocessableCaptureSessionByConfigurations

Bug: 27950067
Change-Id: I8346d384210556a40bc2544c3660cc4819f304a1
2016-04-08 23:21:06 +00:00
Phil Weaver
af93306a3d Merge "Reduce unnecessary accessibility cache clearing." into nyc-dev 2016-04-08 22:33:33 +00:00
Tenghui Zhu
3cb5ba75b7 Merge "Update the documentation on createCircularReveal" into nyc-dev 2016-04-08 21:24:04 +00:00
Bryce Lee
196a05724d Merge "Add granular control over disabled effects." into nyc-dev 2016-04-08 20:59:10 +00:00
Mark Renouf
880602eb64 Customizes input extract edit view for Wear
Provides an alternate presentation of the extract edit area
of an input method window, designed for sub 250dp width screens.

An icon is used on a round material style button in place of a text
action, providing more horizontal space for the editing area.

BUG: 22512982
Change-Id: I16226ce393f2d15065d08e66a36d008eb1a0c8a1
(cherry picked from commit fd71a6a5d99bad5d3ab32edc328fb5b026b66215)
2016-04-08 16:56:25 -04:00
Doris Liu
f26298f8ae resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp
am: 9d5c93f

* commit '9d5c93f40758636fea18616cf915d49eca67d7b0':
  Improve error logging for parsing failures

Change-Id: I1a0a30961f939b9023480d2f3de36665ad8afab9
2016-04-08 20:48:35 +00:00
Doris Liu
9d5c93f407 resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp
Change-Id: Ifa9dea0e4a0337c24dad899a10b5def46679742c
2016-04-08 13:31:42 -07:00
Julia Reynolds
3898db9e15 Merge "Allow the ranker to autobundle notifications." into nyc-dev 2016-04-08 20:13:45 +00:00
Phil Weaver
e37cfab6c6 Reduce unnecessary accessibility cache clearing.
Tracking if accessibility focus is being cleared because it is being
set to another view in the same window. In this case, leave
accessibility focus on the window.

This change greatly reduces the amount of cache re-indexing.
Previously we flushed the cache every time accessibility focus moved.

Bug: 28077283
Change-Id: If80899d36e7f58b22635f844bdd4ea37a55b875e
2016-04-08 13:06:44 -07:00
Jason Monk
aa336f8926 Merge "Allow mode of TileService to be changed" into nyc-dev 2016-04-08 19:37:55 +00:00
Dianne Hackborn
6827db3e5f Merge "Fix issue #28075893: Don't hold strong refs on to JobService" into nyc-dev 2016-04-08 19:28:42 +00:00
Adam Powell
fe5e1a75c1 Merge "Chooser filtering and caller direct share targets" into nyc-dev 2016-04-08 19:20:25 +00:00
Andrii Kulian
21400cb552 Merge "Fix multiple configuration changes in multiwindow" into nyc-dev 2016-04-08 19:05:20 +00:00
Andrii Kulian
701214b282 Fix multiple configuration changes in multiwindow
When in split-screen mode and activity handles configuration changes
it gets 2 onConfigurationChanged calls which originate from
ActivityManagerService#updateConfigurationLocked:
1. app.thread.scheduleConfigurationChanged calls to all process records
   send configuration of the whole screen for corresponding orientation,
   which leads to CONFIGURATION_CHANGED message in ActivityThread.
2. mStackSupervisor.resizeStackLocked call resizes both visible stacks and
   eventually ActivityThread receives ACTIVITY_CONFIGURATION_CHANGED
   message with correct configuration corresponding to space occupied in
   split-screen.

In this CL if component callback is an instance of Activity and it had
override config set - onConfigurationChanged will not be triggered unless
override config has changed.

Bug: 27948331
Change-Id: Ia73b045570b44eb5b351811bf6c4f63d78c3f909
2016-04-08 11:58:43 -07:00