OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fixing issue where PIP did not stay minimized after rotation."
TreeHugger Robot [Sat, 12 Nov 2016 04:59:08 +0000 (04:59 +0000)]
Merge "Fixing issue where PIP did not stay minimized after rotation."

7 years agoMerge "Refactored Shell to use IDumpstateListener."
TreeHugger Robot [Sat, 12 Nov 2016 03:16:13 +0000 (03:16 +0000)]
Merge "Refactored Shell to use IDumpstateListener."

7 years agoMerge changes Ibf5ac3d2,Ie4b216db
Yohei Yukawa [Sat, 12 Nov 2016 01:41:29 +0000 (01:41 +0000)]
Merge changes Ibf5ac3d2,Ie4b216db

* changes:
  Introduce EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING
  Add comments for some int fields in EditorInfo

7 years agoMerge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572 am: d81df46e80
Jakub Pawlowski [Sat, 12 Nov 2016 00:36:22 +0000 (00:36 +0000)]
Merge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572 am: d81df46e80
am: c90cb005fe

Change-Id: I32443204849794f92917a2a2e1098951d5015851

7 years agoMerge "Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am...
Manu Cornet [Sat, 12 Nov 2016 00:26:25 +0000 (00:26 +0000)]
Merge "Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b" into nyc-mr2-dev-plus-aosp
am: 7954cfe6f1  -s ours

Change-Id: Ia01e852d7bc29e0d263ff8750f72451635cc7503

7 years agoMerge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b
Manu Cornet [Sat, 12 Nov 2016 00:26:20 +0000 (00:26 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b
am: f1743ea000  -s ours

Change-Id: Ie91c89b8d71e7e6981502f5079d113ead77b0640

7 years agoFixing issue where PIP did not stay minimized after rotation.
Winson Chung [Sat, 12 Nov 2016 00:25:04 +0000 (16:25 -0800)]
Fixing issue where PIP did not stay minimized after rotation.

- Ensure that we reapply the minimized offset after applying the snap
  fraction to the rotated bounds
- Fixing small issue where we weren't bottom aligning the PIP when the
  visible IME changes size (but is not made invisible)
- Also fixing an issue where the touch gesture continually allowed
  swiping offscreen even after dragging the PIP a distance. Now, if no
  gesture handles the drag, then the default gesture will disallow
  offscreen dragging once it handles the move.
- Shrinking PIP slightly to fit proportions of screen.

Test: Enable minimization in SysUI tuner, put PIP into minimized state,
      rotate the screen.  This is not final UX and the CTS tests will
      be updated to reflect this behavior once it is final.

Change-Id: I15c851a0bcf5f867289bc5ad50d298f82a103308

7 years agoMerge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2...
Manu Cornet [Sat, 12 Nov 2016 00:20:41 +0000 (00:20 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2-dev-plus-aosp
am: 83d7c2c6bc  -s ours

Change-Id: I3b1773369cee2a79a9083c741057d878d4b496d8

7 years agoDO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30
Manu Cornet [Sat, 12 Nov 2016 00:20:36 +0000 (00:20 +0000)]
DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30
am: 9c8280da11  -s ours

Change-Id: I1efca7286bc6c3d915fd980a219c52eeabd0d1f5

7 years agoMerge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c am...
Robert Sesek [Sat, 12 Nov 2016 00:19:15 +0000 (00:19 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c am: a0d2e6f4b7 am: 057e9c16e7
am: 30cc9df94d

Change-Id: I026d24b3531a24a81277b32f197c6d6a4b0a6b6b

7 years agoMerge "Bluetooth: BLE app tracking fixes" am: 2174731449 am: 3d8d5dbb56 am: 56853771ae
Marie Janssen [Sat, 12 Nov 2016 00:17:47 +0000 (00:17 +0000)]
Merge "Bluetooth: BLE app tracking fixes" am: 2174731449 am: 3d8d5dbb56 am: 56853771ae
am: ddede667fb

Change-Id: I82db19aad214fee9aeec8a56e6e1efd13630a616

7 years agoMerge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572
Jakub Pawlowski [Sat, 12 Nov 2016 00:11:19 +0000 (00:11 +0000)]
Merge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572
am: d81df46e80

Change-Id: I7e17eac0305832d69366b565427ec048a7166357

7 years agoMerge "Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am...
Android Build Merger (Role) [Sat, 12 Nov 2016 00:08:37 +0000 (00:08 +0000)]
Merge "Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b" into nyc-mr2-dev-plus-aosp

7 years agoMerge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2...
Android Build Merger (Role) [Sat, 12 Nov 2016 00:08:08 +0000 (00:08 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2-dev-plus-aosp

7 years agoMerge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
Manu Cornet [Sat, 12 Nov 2016 00:06:57 +0000 (00:06 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
am: 954347fb1b

Change-Id: Ia1fd6ab09d6310575bdbceba1d56f0a58160331f

7 years agoDO NOT MERGE - 2-dimensional Recents activity.
Manu Cornet [Sat, 12 Nov 2016 00:06:49 +0000 (00:06 +0000)]
DO NOT MERGE - 2-dimensional Recents activity.
am: c13df1eb30

Change-Id: Idfcea35ba54b69e780bb9159055ea296dd9f14a9

7 years agoMerge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c am...
Robert Sesek [Sat, 12 Nov 2016 00:06:34 +0000 (00:06 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c am: a0d2e6f4b7
am: 057e9c16e7

Change-Id: I96c16db9b8fcd197709179429de07a77cbabe5e8

7 years agoMerge "Bluetooth: BLE app tracking fixes" am: 2174731449 am: 3d8d5dbb56
Marie Janssen [Sat, 12 Nov 2016 00:05:19 +0000 (00:05 +0000)]
Merge "Bluetooth: BLE app tracking fixes" am: 2174731449 am: 3d8d5dbb56
am: 56853771ae

Change-Id: I2c0ac6fd2047643ae3c1e6450397b2cd9eed7e94

7 years agoMerge "Bluetooth: advertising improvements" am: 82c9ba9c55
Jakub Pawlowski [Fri, 11 Nov 2016 23:58:44 +0000 (23:58 +0000)]
Merge "Bluetooth: advertising improvements" am: 82c9ba9c55
am: e3b71cd572

Change-Id: I54df9c355ac951d40b2d8e865d5f36f8875ce71f

7 years agoMerge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev...
Kevin Hufnagle [Fri, 11 Nov 2016 23:56:09 +0000 (23:56 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18 am: 5584ee2131 am: d733ff11ea
am: fefaccb2e7

Change-Id: I627069f3894b13fa38995e9b1d75d56099ae5561

7 years agoMerge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c
Robert Sesek [Fri, 11 Nov 2016 23:55:18 +0000 (23:55 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()." am: b828b6bf6c
am: a0d2e6f4b7

Change-Id: I4044e01b9de9bc502eda18fc34182629ca524701

7 years agoApp Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d97...
Makoto Onuki [Fri, 11 Nov 2016 23:54:51 +0000 (23:54 +0000)]
App Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979 am: b0fd5ba122
am: 7e1b835a4e

Change-Id: I767dcbe980a60af1a3076acdf9234f4241ab7ca1

7 years agoMerge "Bluetooth: BLE app tracking fixes" am: 2174731449
Marie Janssen [Fri, 11 Nov 2016 23:53:47 +0000 (23:53 +0000)]
Merge "Bluetooth: BLE app tracking fixes" am: 2174731449
am: 3d8d5dbb56

Change-Id: Ia9b8950f66f31b0d3b78f6e2f6c2314cf0b931f0

7 years agoMerge "Add check for null manger for a11y recents action" into cw-f-dev am: 87d764f18...
Rati Agrawal [Fri, 11 Nov 2016 23:53:34 +0000 (23:53 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev am: 87d764f184 am: 9261740a8b
am: b098dc6b89

Change-Id: I3c4935a9118474253b8f159c668eeb1062573cf0

7 years agoMerge "Fix unit tests"
TreeHugger Robot [Fri, 11 Nov 2016 23:51:37 +0000 (23:51 +0000)]
Merge "Fix unit tests"

7 years agoMerge "Make another interface oneway, whitelist provider."
TreeHugger Robot [Fri, 11 Nov 2016 23:50:40 +0000 (23:50 +0000)]
Merge "Make another interface oneway, whitelist provider."

7 years agoRefactored Shell to use IDumpstateListener.
Felipe Leme [Fri, 28 Oct 2016 16:32:03 +0000 (09:32 -0700)]
Refactored Shell to use IDumpstateListener.

BugreportProgressService used to poll system properties to get the
progress of the underlying dumpstate process, but now dumpstate provides
a IDumpstateListener and IDumpstateToken binder objects for the same
purpose.

Test: BugreportReceiverTest passes
Test: manual verification

BUG: 31636879

Change-Id: I81d551781a511cb1cc218a27452875b0bb267f7a

7 years agoMerge "Bluetooth: advertising improvements"
Jakub Pawlowski [Fri, 11 Nov 2016 23:48:51 +0000 (23:48 +0000)]
Merge "Bluetooth: advertising improvements"
am: 82c9ba9c55

Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb

7 years agoMerge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev
TreeHugger Robot [Fri, 11 Nov 2016 23:46:26 +0000 (23:46 +0000)]
Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev

7 years agoMerge "Respect force_mount_namespace in MountEmulatedStorage()."
Robert Sesek [Fri, 11 Nov 2016 23:44:49 +0000 (23:44 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
am: b828b6bf6c

Change-Id: I9b4d0000c29d5e404f333d8e8c89af2425452a17

7 years agoMerge "Fix a bug where the wrong task was selected coming from home"
TreeHugger Robot [Fri, 11 Nov 2016 23:44:29 +0000 (23:44 +0000)]
Merge "Fix a bug where the wrong task was selected coming from home"

7 years agoAdd check for null manger for a11y recents action am: 2585033100 am: 0cd036da23
Phil Weaver [Fri, 11 Nov 2016 23:41:49 +0000 (23:41 +0000)]
Add check for null manger for a11y recents action am: 2585033100 am: 0cd036da23
am: 115622e9cf

Change-Id: I687ab29956a96dcbe122b7c30860f38bc274c2cd

7 years agoMerge "Bluetooth: BLE app tracking fixes"
Marie Janssen [Fri, 11 Nov 2016 23:41:42 +0000 (23:41 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
am: 2174731449

Change-Id: Id07abb3d5ad76b318d1b7cee6d9fb9351737b141

7 years agoMerge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev...
Kevin Hufnagle [Fri, 11 Nov 2016 23:40:43 +0000 (23:40 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18 am: 5584ee2131
am: d733ff11ea

Change-Id: I323b294af1ea7b4a86d5eef7bd7670c965e1b5bf

7 years agoApp Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979
Makoto Onuki [Fri, 11 Nov 2016 23:36:04 +0000 (23:36 +0000)]
App Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979
am: b0fd5ba122

Change-Id: I4780d09f8b692dbe76f1726a436f9693281fd488

7 years agoMerge "Add check for null manger for a11y recents action" into cw-f-dev am: 87d764f184
Rati Agrawal [Fri, 11 Nov 2016 23:34:32 +0000 (23:34 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev am: 87d764f184
am: 9261740a8b

Change-Id: Ib93bfac0e85da0aaa582924c981f59e52f45ea8e

7 years agoMerge "Bluetooth: advertising improvements"
Jakub Pawlowski [Fri, 11 Nov 2016 23:33:14 +0000 (23:33 +0000)]
Merge "Bluetooth: advertising improvements"

7 years agoMerge "Update TextView ApiDocs."
Siyamed Sinir [Fri, 11 Nov 2016 23:31:08 +0000 (23:31 +0000)]
Merge "Update TextView ApiDocs."

7 years agoAdd check for null manger for a11y recents action am: 2585033100
Phil Weaver [Fri, 11 Nov 2016 23:29:59 +0000 (23:29 +0000)]
Add check for null manger for a11y recents action am: 2585033100
am: 0cd036da23

Change-Id: Ic10e13d83bd6cb2dab3b445e8b5ec41a45e08fa6

7 years agoBluetooth: advertising improvements
Jakub Pawlowski [Fri, 4 Nov 2016 22:25:57 +0000 (15:25 -0700)]
Bluetooth: advertising improvements

This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.

Bug: 30622771
Bug: 24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026

7 years agoMerge "Respect force_mount_namespace in MountEmulatedStorage()."
Treehugger Robot [Fri, 11 Nov 2016 23:25:43 +0000 (23:25 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."

7 years agoMerge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev...
Kevin Hufnagle [Fri, 11 Nov 2016 23:23:20 +0000 (23:23 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev am: 867d09fe18
am: 5584ee2131

Change-Id: I84a7d1b5eb89fa5c796e2db7838aee0af9114486

7 years agoMerge "Bluetooth: BLE app tracking fixes"
Treehugger Robot [Fri, 11 Nov 2016 23:22:55 +0000 (23:22 +0000)]
Merge "Bluetooth: BLE app tracking fixes"

7 years agoApp Shortcut: Clarify which attributes must be resources am: 104f805337
Makoto Onuki [Fri, 11 Nov 2016 23:22:08 +0000 (23:22 +0000)]
App Shortcut: Clarify which attributes must be resources am: 104f805337
am: 2a3fe7d979

Change-Id: I7858db41a362e3be0a8668f23476b082e8140f43

7 years agoMerge "Ensure consistent stack behind PIP when going to/from fullscreen."
TreeHugger Robot [Fri, 11 Nov 2016 23:20:33 +0000 (23:20 +0000)]
Merge "Ensure consistent stack behind PIP when going to/from fullscreen."

7 years agoMerge "Add check for null manger for a11y recents action" into cw-f-dev
Rati Agrawal [Fri, 11 Nov 2016 23:17:43 +0000 (23:17 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev
am: 87d764f184

Change-Id: I4b1424314f9b8bd1c2d463e2a3c62c90bbe107e8

7 years agoAdd check for null manger for a11y recents action
Phil Weaver [Fri, 11 Nov 2016 23:17:41 +0000 (23:17 +0000)]
Add check for null manger for a11y recents action
am: 2585033100

Change-Id: I9b5977ad876048e5c527ff1f8ef6b989283a0e73

7 years agoMerge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
Kevin Hufnagle [Fri, 11 Nov 2016 23:14:28 +0000 (23:14 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
am: 867d09fe18

Change-Id: Ib56e1a8895557d43aadd8eada75dce2d9b836dc9

7 years agoApp Shortcut: Clarify which attributes must be resources
Makoto Onuki [Fri, 11 Nov 2016 23:14:22 +0000 (23:14 +0000)]
App Shortcut: Clarify which attributes must be resources
am: 104f805337

Change-Id: I85eb5652c978fe4c41059158cf1d0f180b51fdd7

7 years agoMerge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084...
Yigit Boyar [Fri, 11 Nov 2016 23:06:13 +0000 (23:06 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084 am: 4e49a3a008 am: 00ab52e3a2
am: 74a9f0f672

Change-Id: I8b96e4d0a55fbedb87767e0ed55a95cd1e8661fa

7 years agoList all methods that change data in the docs am: 42c69b9ce4 am: 7e6fdaab69 am: 93f13...
Yigit Boyar [Fri, 11 Nov 2016 23:04:10 +0000 (23:04 +0000)]
List all methods that change data in the docs am: 42c69b9ce4 am: 7e6fdaab69 am: 93f130e232
am: 586c7e26f7

Change-Id: I28fb42476eebb0437b58b076574b1119d233ec01

7 years agoMerge "Add check for null manger for a11y recents action" into cw-f-dev
Rati Agrawal [Fri, 11 Nov 2016 23:03:30 +0000 (23:03 +0000)]
Merge "Add check for null manger for a11y recents action" into cw-f-dev

7 years agoMerge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084...
Yigit Boyar [Fri, 11 Nov 2016 22:53:17 +0000 (22:53 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084 am: 4e49a3a008
am: 00ab52e3a2

Change-Id: I135b0f83c5041e5467a808694fc93408d63a75d1

7 years agoList all methods that change data in the docs am: 42c69b9ce4 am: 7e6fdaab69
Yigit Boyar [Fri, 11 Nov 2016 22:52:01 +0000 (22:52 +0000)]
List all methods that change data in the docs am: 42c69b9ce4 am: 7e6fdaab69
am: 93f130e232

Change-Id: Id95fff602b22d376cfd81fbafdc22fac376a644c

7 years agoMerge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084
Yigit Boyar [Fri, 11 Nov 2016 22:46:32 +0000 (22:46 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am: 7cd6c3a084
am: 4e49a3a008

Change-Id: I8b40b32c181ceab9b53e3593c11f5f716b27c1d7

7 years agoMerge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev
Kevin Hufnagle [Fri, 11 Nov 2016 22:44:01 +0000 (22:44 +0000)]
Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev

7 years agoList all methods that change data in the docs am: 42c69b9ce4
Yigit Boyar [Fri, 11 Nov 2016 22:39:25 +0000 (22:39 +0000)]
List all methods that change data in the docs am: 42c69b9ce4
am: 7e6fdaab69

Change-Id: Ife360d719384d958b6022f29f928a5bbae2ed6ef

7 years agoMerge "List all methods that change data in the docs" into nyc-mr1-dev
Yigit Boyar [Fri, 11 Nov 2016 22:31:21 +0000 (22:31 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
am: 7cd6c3a084

Change-Id: I1eb87e80c76d7229dab716a3c3e7bf35104f59c5

7 years agoList all methods that change data in the docs
Yigit Boyar [Fri, 11 Nov 2016 22:31:15 +0000 (22:31 +0000)]
List all methods that change data in the docs
am: 42c69b9ce4

Change-Id: I0808918c44981da63ace801c486d442ff1a99700

7 years agoMerge "List all methods that change data in the docs" into nyc-mr1-dev
Yigit Boyar [Fri, 11 Nov 2016 22:14:11 +0000 (22:14 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev

7 years agoFix unit tests
John Reck [Fri, 11 Nov 2016 22:09:09 +0000 (14:09 -0800)]
Fix unit tests

This is a partial revert of e2179925df2ce174d81dd6f7abae626cc859ce00
with the TODO comment replaced with why this can happen.

Test: Ran hwui's unit tests
Change-Id: I0d35eef773a401585bb8e75415da66de5aeb27d1

7 years agoFix a bug where the wrong task was selected coming from home
Manu Cornet [Fri, 11 Nov 2016 02:53:08 +0000 (18:53 -0800)]
Fix a bug where the wrong task was selected coming from home

The following behavior was buggy: Home -> toggle recents -> toggle
recents again.

This reverts to using the same model (task stack where older tasks are
first) as other Recents, and only reversing the order when placing
views on screen. Then the same logic as existing Recents implementation
can be used.

Bug: 32101881
Test: Tested behavior locally on Ryu. Existing tests should cover.
Change-Id: I52899af4581921902cd781dee707caea694d27e8

7 years agoBluetooth: BLE app tracking fixes
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes

Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.

Test: enable and disable bluetooth an LE-only app running
Bug: 32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c

7 years agoMake another interface oneway, whitelist provider.
Jeff Sharkey [Fri, 11 Nov 2016 21:04:32 +0000 (14:04 -0700)]
Make another interface oneway, whitelist provider.

More progress towards removing blocking calls to improve system
stability.

Test: builds, boots
Bug: 32715088
Change-Id: I5ab2d2687f4f47e0ee68105c6998e74798af061c

7 years agoMerge "Make AmrInputStream use MediaCodec" am: 866658261f am: 618c1a9ae6 am: fd91fcc970
Marco Nelissen [Fri, 11 Nov 2016 21:03:19 +0000 (21:03 +0000)]
Merge "Make AmrInputStream use MediaCodec" am: 866658261f am: 618c1a9ae6 am: fd91fcc970
am: 43cbb6bd6c  -s ours

Change-Id: Ia09fc733808e2f763675806a3469bfe8aec78d0d

7 years agoMerge "Move the 'next launch target' logic into the task stack"
Manu Cornet [Fri, 11 Nov 2016 21:02:07 +0000 (21:02 +0000)]
Merge "Move the 'next launch target' logic into the task stack"

7 years agoDO NOT MERGE - 2-dimensional Recents activity.
Manu Cornet [Fri, 11 Nov 2016 19:36:08 +0000 (11:36 -0800)]
DO NOT MERGE - 2-dimensional Recents activity.

This is a simple first version in the spirit of small, incremental CLs.
It is fully functional but the following will come in later changes:

* Split screen support
* Potential animations
* Alt-tab behavior
* Relayout on orientation changes

The new activity is only started when a specific system property is set.

Test: Tested new activity behavior on local Ryu. Added tests for layout logic.
Bug: 32101881
Merged-In: I550f6e7ea0de3937dbf80e5f0294676cfe567d47
Change-Id: I46a537646e98b312d831510e1d331948888ae5ce

7 years agoMerge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regene...
Jack Yu [Fri, 11 Nov 2016 20:24:57 +0000 (20:24 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c am: 3cfa510779 am: d517ea753f
am: 9b968a1644

Change-Id: Iaba6209cd6ac5914fb798cbf7003fa1037e2f91f

7 years agoMerge "Make AmrInputStream use MediaCodec" am: 866658261f am: 618c1a9ae6
Marco Nelissen [Fri, 11 Nov 2016 20:22:58 +0000 (20:22 +0000)]
Merge "Make AmrInputStream use MediaCodec" am: 866658261f am: 618c1a9ae6
am: fd91fcc970

Change-Id: Ib32029cce0ce9b7d6b0c51ad9a5e141b40a34304

7 years agoMerge "Make getter & setting names consistent."
TreeHugger Robot [Fri, 11 Nov 2016 20:19:45 +0000 (20:19 +0000)]
Merge "Make getter & setting names consistent."

7 years agoMerge "Make AmrInputStream use MediaCodec" am: 866658261f
Marco Nelissen [Fri, 11 Nov 2016 20:16:00 +0000 (20:16 +0000)]
Merge "Make AmrInputStream use MediaCodec" am: 866658261f
am: 618c1a9ae6

Change-Id: Ic6723d4e2ce7ab401908ca955a785463612509bb

7 years agoMerge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regene...
Jack Yu [Fri, 11 Nov 2016 20:11:02 +0000 (20:11 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c am: 3cfa510779
am: d517ea753f

Change-Id: Iaa642d19d006133a8d378a43253aaa35053db564

7 years agoMerge "Make AmrInputStream use MediaCodec"
Marco Nelissen [Fri, 11 Nov 2016 20:10:00 +0000 (20:10 +0000)]
Merge "Make AmrInputStream use MediaCodec"
am: 866658261f

Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 11ea7e4283 -s ours am...
Bill Yi [Fri, 11 Nov 2016 19:58:17 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 11ea7e4283  -s ours am: 5e123b336a  -s ours
am: c48a8b3dc3  -s ours

Change-Id: Ic23205ef476f8d8c05028ed7f762e89a4cc94f60

7 years agoMerge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regene...
Jack Yu [Fri, 11 Nov 2016 19:57:55 +0000 (19:57 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" am: 4469e48d5c
am: 3cfa510779

Change-Id: I65746e4959851eb4662881db4fd8d9665070da71

7 years agoImport translations. DO NOT MERGE am: b8aaaa8949 -s ours am: c967ede5c8 -s ours
Bill Yi [Fri, 11 Nov 2016 19:56:57 +0000 (19:56 +0000)]
Import translations. DO NOT MERGE am: b8aaaa8949  -s ours am: c967ede5c8  -s ours
am: 6a96cc7365  -s ours

Change-Id: I05f15eec71591052f255d0ee0dae43a5a3119227

7 years agoMerge "Make AmrInputStream use MediaCodec"
Treehugger Robot [Fri, 11 Nov 2016 19:54:38 +0000 (19:54 +0000)]
Merge "Make AmrInputStream use MediaCodec"

7 years agoMerge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regene...
Jack Yu [Fri, 11 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API"
am: 4469e48d5c

Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619

7 years agoEnsure consistent stack behind PIP when going to/from fullscreen.
Winson Chung [Fri, 11 Nov 2016 01:40:34 +0000 (17:40 -0800)]
Ensure consistent stack behind PIP when going to/from fullscreen.

- When a fullscreen activity enters PIP, we were previously always
  bringing the home stack forward due to the return type being set
  to HOME_ACTIVITY_TYPE, causing the home screen to be visible if
  expanding PIP over a fullscreen activity and going back into PIP
  immediately.  This CL instead updates the return-to type to
  reflect the stack that was currently open before the pinned task
  was made fullscreen again to ensure that it is consistent when
  entering PIP again.

Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testPipUnPipOverHome
Test: #testPipUnPipOverApp

Change-Id: Id5dd7db1f5a8040ff21190cc347eb6aae5893006

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 3cf37c7dc3 -s ours am...
Bill Yi [Fri, 11 Nov 2016 19:46:33 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3cf37c7dc3  -s ours am: 500e07de70  -s ours
am: b287250e36  -s ours

Change-Id: I6775260675e9b6125e6d3fb1c4dc935f1a4a9efa

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 11ea7e4283 -s ours
Bill Yi [Fri, 11 Nov 2016 19:45:44 +0000 (19:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 11ea7e4283  -s ours
am: 5e123b336a  -s ours

Change-Id: Ia7407399c911d052bc2086646d275767b094e21c

7 years agoImport translations. DO NOT MERGE am: e65092639f -s ours am: 5d51ac0da1 -s ours
Bill Yi [Fri, 11 Nov 2016 19:45:19 +0000 (19:45 +0000)]
Import translations. DO NOT MERGE am: e65092639f  -s ours am: 5d51ac0da1  -s ours
am: 514be3f5a1  -s ours

Change-Id: I56bc368b2cf57645014cb723897b6f57a85445ff

7 years agoImport translations. DO NOT MERGE am: b8aaaa8949 -s ours
Bill Yi [Fri, 11 Nov 2016 19:44:30 +0000 (19:44 +0000)]
Import translations. DO NOT MERGE am: b8aaaa8949  -s ours
am: c967ede5c8  -s ours

Change-Id: I8ebb662bfa9ad1a4e1b3ef14d9f221e5aadf6c69

7 years agoMerge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regene...
Jack Yu [Fri, 11 Nov 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API"

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:37:55 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 11ea7e4283  -s ours

Change-Id: I51ee786f03d8ad92dcfc740c5a55914bc7f16c4a

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 11 Nov 2016 19:37:53 +0000 (19:37 +0000)]
Import translations. DO NOT MERGE
am: b8aaaa8949  -s ours

Change-Id: I5b120c2d816f8ba20ad443c9dbbdf5797e85923a

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: d9c8da1283 -s ours am...
Bill Yi [Fri, 11 Nov 2016 19:35:37 +0000 (19:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d9c8da1283  -s ours am: f2790ac31d  -s ours
am: c60f617abf  -s ours

Change-Id: I4086b464baf1c0a1f84bca6192fa151d4fef301e

7 years agoImport translations. DO NOT MERGE am: 05a48e2a3d -s ours am: edbd698183 -s ours
Bill Yi [Fri, 11 Nov 2016 19:34:23 +0000 (19:34 +0000)]
Import translations. DO NOT MERGE am: 05a48e2a3d  -s ours am: edbd698183  -s ours
am: 23c37cddac  -s ours

Change-Id: Ib2fd440354937f5a16f82a78c4100be2d6603738

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 3cf37c7dc3 -s ours
Bill Yi [Fri, 11 Nov 2016 19:33:17 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3cf37c7dc3  -s ours
am: 500e07de70  -s ours

Change-Id: I2d593fdb256d9e4284e36b0f729b778742cb172f

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: c6c0d901bf -s ours am...
Bill Yi [Fri, 11 Nov 2016 19:33:16 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c6c0d901bf  -s ours am: 8c8e6ef26a  -s ours
am: 7b6a39223b  -s ours

Change-Id: Ie3ef88b9bbb7dc28bc9320c49eb508527dd98990

7 years agoImport translations. DO NOT MERGE am: e65092639f -s ours
Bill Yi [Fri, 11 Nov 2016 19:31:56 +0000 (19:31 +0000)]
Import translations. DO NOT MERGE am: e65092639f  -s ours
am: 5d51ac0da1  -s ours

Change-Id: I47f1c79b28a752a33d536a3f8af6849bd94b3980

7 years agoImport translations. DO NOT MERGE am: f5ffd25c53 -s ours am: 846acc7a07 -s ours
Bill Yi [Fri, 11 Nov 2016 19:31:56 +0000 (19:31 +0000)]
Import translations. DO NOT MERGE am: f5ffd25c53  -s ours am: 846acc7a07  -s ours
am: 4a52268e88  -s ours

Change-Id: I59897d2361bca9eea11290abf26a58b20582c907

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 19:29:57 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 1741524a82 -s ours am...
Bill Yi [Fri, 11 Nov 2016 19:27:27 +0000 (19:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1741524a82  -s ours am: 6a6db79a4c  -s ours
am: 0c26c0f8cf  -s ours

Change-Id: I9f7f4be2f0d01b6df5ae30c3337336611d178a95

7 years agoImport translations. DO NOT MERGE am: 3bd78c2416 -s ours am: 2f5e9c695c -s ours
Bill Yi [Fri, 11 Nov 2016 19:26:13 +0000 (19:26 +0000)]
Import translations. DO NOT MERGE am: 3bd78c2416  -s ours am: 2f5e9c695c  -s ours
am: 3c0467bf0f  -s ours

Change-Id: Id9602628d6fe54882ea2aedc8ccc34d29cb9485e

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:25:23 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 3cf37c7dc3  -s ours

Change-Id: I4593fb756b4ef79571712e707fcaeadd7da14968

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 11 Nov 2016 19:25:22 +0000 (19:25 +0000)]
Import translations. DO NOT MERGE
am: e65092639f  -s ours

Change-Id: I6d7024e618d7092b283d52e068d0f1a2646e8a46

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 8f278a7e06 -s ours am...
Bill Yi [Fri, 11 Nov 2016 19:25:03 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 8f278a7e06  -s ours am: f331a01a15  -s ours
am: 3a9174dcc6  -s ours

Change-Id: Ib0816587c0930088ef8d242869be0aec6eafa28d

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: d9c8da1283 -s ours
Bill Yi [Fri, 11 Nov 2016 19:24:52 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: d9c8da1283  -s ours
am: f2790ac31d  -s ours

Change-Id: I7ed9d9242eaa1ceed6a939315151c0b708f5cf0b

7 years agoImport translations. DO NOT MERGE am: c51dd09193 -s ours am: 0966a9085d -s ours
Bill Yi [Fri, 11 Nov 2016 19:23:55 +0000 (19:23 +0000)]
Import translations. DO NOT MERGE am: c51dd09193  -s ours am: 0966a9085d  -s ours
am: fddeb9af1a  -s ours

Change-Id: Ib1d712c2b11d1aaa9de5c7a33a828dbbd2bbd65f