OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge changes from topic \'icu_cp_catchup\' am: f6aabd95df am: 2b44297ff7
Neil Fuller [Thu, 5 May 2016 15:22:59 +0000 (15:22 +0000)]
Merge changes from topic \'icu_cp_catchup\' am: f6aabd95df am: 2b44297ff7
am: 5f236d9a4a

* commit '5f236d9a4a40617f713b08c19c656c3d1e748879':
  Track external/icu API changes for factory registration
  ICU4J: Hide constants that can change between releases
  Remove RawCollationKey/ByteArrayWrapper from the public API

Change-Id: I33b547bb9fe12459558033e6264f3795ec42cee7

8 years agoMerge changes from topic \'icu_cp_catchup\' am: f6aabd95df
Neil Fuller [Thu, 5 May 2016 15:18:37 +0000 (15:18 +0000)]
Merge changes from topic \'icu_cp_catchup\' am: f6aabd95df
am: 2b44297ff7

* commit '2b44297ff7004196ec6dcb631a4430e0c29c9bd2':
  Track external/icu API changes for factory registration
  ICU4J: Hide constants that can change between releases
  Remove RawCollationKey/ByteArrayWrapper from the public API

Change-Id: I485a59fa5a565d6916c9eed1e03dce3d01145a4e

8 years agoMerge changes from topic \'icu_cp_catchup\'
Neil Fuller [Thu, 5 May 2016 15:15:55 +0000 (15:15 +0000)]
Merge changes from topic \'icu_cp_catchup\'
am: f6aabd95df

* commit 'f6aabd95df71e5b64a0b3806a7632954ed7cfd99':
  Track external/icu API changes for factory registration
  ICU4J: Hide constants that can change between releases
  Remove RawCollationKey/ByteArrayWrapper from the public API

Change-Id: Ifd6e4730450211a586ac8a6abec71c1faa055e8c

8 years agoMerge changes from topic 'icu_cp_catchup'
Neil Fuller [Thu, 5 May 2016 15:06:47 +0000 (15:06 +0000)]
Merge changes from topic 'icu_cp_catchup'

* changes:
  Track external/icu API changes for factory registration
  ICU4J: Hide constants that can change between releases
  Remove RawCollationKey/ByteArrayWrapper from the public API

8 years agoMerge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am:...
Android Build Merger (Role) [Thu, 5 May 2016 14:20:02 +0000 (14:20 +0000)]
Merge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am: 27c6fb03d8" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
Adrian Roos [Thu, 5 May 2016 14:19:35 +0000 (14:19 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
am: 27c6fb03d8

* commit '27c6fb03d8ab38c090e28a72aee1a4ccec514122':

Change-Id: Ib4c721e27ee0336758c1738e21766f5f08e88fcb

8 years agoMerge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am:...
Android Build Merger (Role) [Thu, 5 May 2016 14:17:39 +0000 (14:17 +0000)]
Merge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0 am: 27c6fb03d8" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
Adrian Roos [Thu, 5 May 2016 14:17:11 +0000 (14:17 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
am: 27c6fb03d8

* commit '27c6fb03d8ab38c090e28a72aee1a4ccec514122':
  Fix Trust Agent discovery for FBE

Change-Id: I5cb87859e9717f6e73af54b3b79426577ec893b1

8 years agoMerge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
Adrian Roos [Thu, 5 May 2016 14:17:05 +0000 (14:17 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am: 957df516f0
am: a4de8ee5ee

* commit 'a4de8ee5ee2a9024e9abf946027d18471db63fe0':
  Fix Trust Agent discovery for FBE

Change-Id: I3af292946e793d21109907ee926655294712898e

8 years agoMerge "Fix Trust Agent discovery for FBE" into nyc-dev
Adrian Roos [Thu, 5 May 2016 14:12:39 +0000 (14:12 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev
am: 957df516f0

* commit '957df516f006129198847ff9448004c097e1be98':
  Fix Trust Agent discovery for FBE

Change-Id: I51cfea9ab91950fea7f0e599a4300b4ac42d5849

8 years agoMerge "Fix Trust Agent discovery for FBE" into nyc-dev
Adrian Roos [Thu, 5 May 2016 14:12:33 +0000 (14:12 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev
am: 957df516f0

* commit '957df516f006129198847ff9448004c097e1be98':
  Fix Trust Agent discovery for FBE

Change-Id: I6afecf1568563550a95a73611576035c5f9a09c8

8 years agoMerge "Fix Trust Agent discovery for FBE" into nyc-dev
Adrian Roos [Thu, 5 May 2016 14:05:08 +0000 (14:05 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev

8 years agoMerge "Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1 am: 9a1cc8...
Android Build Merger (Role) [Thu, 5 May 2016 13:39:36 +0000 (13:39 +0000)]
Merge "Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1 am: 9a1cc86c35" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1
Clara Bayarri [Thu, 5 May 2016 13:39:11 +0000 (13:39 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1
am: 9a1cc86c35

* commit '9a1cc86c35965477078f5b9a51d63e59b6577a9c':

Change-Id: I6c39c7a4f87a44d696a00c2bb0d90b5a7462a1df

8 years agoMerge "Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1 am: 9a1cc8...
Android Build Merger (Role) [Thu, 5 May 2016 13:37:27 +0000 (13:37 +0000)]
Merge "Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1 am: 9a1cc86c35" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1
Clara Bayarri [Thu, 5 May 2016 13:37:00 +0000 (13:37 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1
am: 0722dabda6

* commit '0722dabda6250c7e42a1ba95e75ac0d62ed38aab':
  Fix RTL margins on Power dialog

Change-Id: Iedac5603ca3baded90b00142121b4816eb493b14

8 years agoMerge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1
Clara Bayarri [Thu, 5 May 2016 13:36:58 +0000 (13:36 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev am: 6bfac039b1
am: 9a1cc86c35

* commit '9a1cc86c35965477078f5b9a51d63e59b6577a9c':
  Fix RTL margins on Power dialog

Change-Id: Ia184e2295342b86a0c53a21f4736dfea3a1d9961

8 years agoMerge "Fix RTL margins on Power dialog" into nyc-dev
Clara Bayarri [Thu, 5 May 2016 13:34:31 +0000 (13:34 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev
am: 6bfac039b1

* commit '6bfac039b130268868af21252c58d07fcaa64074':
  Fix RTL margins on Power dialog

Change-Id: Icb15ac4c932645e3a07197a9d181e283a4f34fd8

8 years agoMerge "Fix RTL margins on Power dialog" into nyc-dev
Clara Bayarri [Thu, 5 May 2016 13:34:30 +0000 (13:34 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev
am: 6bfac039b1

* commit '6bfac039b130268868af21252c58d07fcaa64074':
  Fix RTL margins on Power dialog

Change-Id: I3d18791d9008dfd877878008e81507efdb84723f

8 years agoMerge "Fix RTL margins on Power dialog" into nyc-dev
Clara Bayarri [Thu, 5 May 2016 13:29:12 +0000 (13:29 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev

8 years agoMerge "Merge "PackageManager : Log stats about the optimizing apps dialog." into...
Android Build Merger (Role) [Thu, 5 May 2016 13:22:42 +0000 (13:22 +0000)]
Merge "Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am: 1ef61df23c am: f3eef0712d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev...
Narayan Kamath [Thu, 5 May 2016 13:22:18 +0000 (13:22 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am: 1ef61df23c
am: f3eef0712d

* commit 'f3eef0712d5cb8fa30f25219e28281599e97d36f':

Change-Id: Ic4eb8c3b48578dfd83cfcdd0cc1ed300abe7ba60

8 years agoMerge "Merge "PackageManager : Log stats about the optimizing apps dialog." into...
Android Build Merger (Role) [Thu, 5 May 2016 13:20:31 +0000 (13:20 +0000)]
Merge "Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am: 1ef61df23c am: f3eef0712d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev...
Narayan Kamath [Thu, 5 May 2016 13:20:05 +0000 (13:20 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am: 1ef61df23c
am: f3eef0712d

* commit 'f3eef0712d5cb8fa30f25219e28281599e97d36f':
  PackageManager : Log stats about the optimizing apps dialog.

Change-Id: I75b123f078ecf834fc86fd33f8546307aac48182

8 years agoMerge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev...
Narayan Kamath [Thu, 5 May 2016 13:20:01 +0000 (13:20 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am: 1ef61df23c
am: 292f4f7941

* commit '292f4f7941a6f78af902e8421e97cdfb2e00f7a8':
  PackageManager : Log stats about the optimizing apps dialog.

Change-Id: I25a2f7e2ad10984cef1f04298aaa482e8fef7bb7

8 years agoMerge "Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev...
Android Build Merger (Role) [Thu, 5 May 2016 13:17:41 +0000 (13:17 +0000)]
Merge "Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95 am: 6f2cff43c0" into nyc-mr1-dev-plus-aosp

8 years agoMerge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
Narayan Kamath [Thu, 5 May 2016 13:17:01 +0000 (13:17 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
am: 1ef61df23c

* commit '1ef61df23c37b34fb7444ef8bbf802f276204484':
  PackageManager : Log stats about the optimizing apps dialog.

Change-Id: If95c3a60b9b612f2ffdba313763787edd0c7b774

8 years agoMerge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95
Rubin Xu [Thu, 5 May 2016 13:17:01 +0000 (13:17 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95
am: 6f2cff43c0

* commit '6f2cff43c08db6a64e5871f04e335e88ff32d471':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: Ia93bb18e743b55013d10440db07e8f83b8cb9362

8 years agoMerge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
Narayan Kamath [Thu, 5 May 2016 13:16:55 +0000 (13:16 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
am: 1ef61df23c

* commit '1ef61df23c37b34fb7444ef8bbf802f276204484':
  PackageManager : Log stats about the optimizing apps dialog.

Change-Id: I39161841480a925b36764e6d7ebd278fc9ac0103

8 years agoMerge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95
Rubin Xu [Thu, 5 May 2016 13:16:55 +0000 (13:16 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95
am: b9d94a454d

* commit 'b9d94a454d426e86f7c032f130d089af65120bf4':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I25456d9756eefb619d446f23d48b0919a53c073f

8 years agoMerge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
Rubin Xu [Thu, 5 May 2016 13:12:45 +0000 (13:12 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675

8 years agoMerge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
Rubin Xu [Thu, 5 May 2016 13:12:43 +0000 (13:12 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I9d76de442e2b852314874d4121be7f15e40045b1

8 years agoMerge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
TreeHugger Robot [Thu, 5 May 2016 13:10:47 +0000 (13:10 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev

8 years agoMerge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
Rubin Xu [Thu, 5 May 2016 13:03:46 +0000 (13:03 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev

8 years agoMerge "Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede...
Android Build Merger (Role) [Thu, 5 May 2016 12:30:39 +0000 (12:30 +0000)]
Merge "Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede am: 619ccaca06" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede
Diego Perez [Thu, 5 May 2016 12:30:15 +0000 (12:30 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede
am: 619ccaca06

* commit '619ccaca06df9f7c15e4ad25d0708d7c53b531c4':
  Add missing delegate in Bitmap_Delegate

Change-Id: I4b0c3be93154e778040ffe604ec7ad857ebecb66

8 years agoMerge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede
Diego Perez [Thu, 5 May 2016 12:30:12 +0000 (12:30 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am: e37ecbdede
am: e8498819f8

* commit 'e8498819f80226065c077cb78451848d6514728d':
  Add missing delegate in Bitmap_Delegate

Change-Id: I6c2475f85dfb663017d0f3123b964ecdc459d6aa

8 years agoMerge "Add missing delegate in Bitmap_Delegate" into nyc-dev
Diego Perez [Thu, 5 May 2016 12:27:45 +0000 (12:27 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
am: e37ecbdede

* commit 'e37ecbdede9bb3b4fadba359891b13eb5cd6c697':
  Add missing delegate in Bitmap_Delegate

Change-Id: Ib8e9fd1772a605ba75ffd7cf868fa654c50cb1e5

8 years agoMerge "Add missing delegate in Bitmap_Delegate" into nyc-dev
Diego Perez [Thu, 5 May 2016 12:27:42 +0000 (12:27 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
am: e37ecbdede

* commit 'e37ecbdede9bb3b4fadba359891b13eb5cd6c697':
  Add missing delegate in Bitmap_Delegate

Change-Id: Iff826aed812d38901b72524cd4ec54dd5908545f

8 years agoMerge "Add missing delegate in Bitmap_Delegate" into nyc-dev
Diego Perez [Thu, 5 May 2016 12:21:34 +0000 (12:21 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev

8 years agoPackageManager : Log stats about the optimizing apps dialog.
Narayan Kamath [Tue, 3 May 2016 10:55:23 +0000 (11:55 +0100)]
PackageManager : Log stats about the optimizing apps dialog.

Logs the following parameters :
- Total time spent optimizing apps.
- Total number of apps that were dexopted.

TESTED: with adb logcat -b events:
05-04 15:24:16.303  2065  2065 I sysui_action: [402,3]
05-04 15:24:16.303  2065  2065 I sysui_action: [403,34]
05-04 15:24:16.303  2065  2065 I sysui_action: [404,0]
05-04 15:24:16.304  2065  2065 I sysui_action: [405,163]
05-04 15:24:16.304  2065  2065 I sysui_action: [406,12168]

This shows that:
 - 3 apps were optimized
 - 34 apps were skipped
 - 0 apps failed to optimize
 - dialog showed a total of 37 (3 + 34 + 0) apps
 - system has 163 optimizable packages
 - a total of 12.2 seconds was spent in the optimizing apps dialog

bug: 28528058
bug: 28544474
Change-Id: I9eb5229a1589ca0df57d3fc03102992fa90a877f

8 years agoGuard retrievePreRebootSecurityLogs with config flag
Rubin Xu [Wed, 4 May 2016 18:01:07 +0000 (19:01 +0100)]
Guard retrievePreRebootSecurityLogs with config flag

Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920

8 years agoTrack external/icu API changes for factory registration
Neil Fuller [Wed, 4 May 2016 17:46:45 +0000 (18:46 +0100)]
Track external/icu API changes for factory registration

Bug: 28583844
(cherry picked from commit e7fda97fff236afa5597da7df69b1462390c5a14)

Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842

8 years agoICU4J: Hide constants that can change between releases
Paul Duffin [Thu, 31 Mar 2016 12:15:03 +0000 (13:15 +0100)]
ICU4J: Hide constants that can change between releases

Bug: 27830659
(cherry picked from commit 71498f107ce41a1c3f2bc612fa214579aab19db1)

Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c

8 years agoRemove RawCollationKey/ByteArrayWrapper from the public API
Paul Duffin [Tue, 22 Mar 2016 16:53:41 +0000 (16:53 +0000)]
Remove RawCollationKey/ByteArrayWrapper from the public API

Bug: 22023363
(cherry picked from commit baa72515f60af798ea9a03e53a78a7d95834ceff)

Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c

8 years agoMerge "Merge "Track external/icu API changes for factory registration" into nyc-dev...
Android Build Merger (Role) [Thu, 5 May 2016 10:06:05 +0000 (10:06 +0000)]
Merge "Merge "Track external/icu API changes for factory registration" into nyc-dev am: 00e8fef0ba am: 08b46f3431" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Track external/icu API changes for factory registration" into nyc-dev am:...
Neil Fuller [Thu, 5 May 2016 10:05:39 +0000 (10:05 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev am: 00e8fef0ba
am: 08b46f3431

* commit '08b46f3431163701ad08d48a0dacfb2a4fe42ab2':

Change-Id: I636f137e50b386a04513813c9e047ac3930699c5

8 years agoMerge "Merge "Track external/icu API changes for factory registration" into nyc-dev...
Android Build Merger (Role) [Thu, 5 May 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Merge "Track external/icu API changes for factory registration" into nyc-dev am: 00e8fef0ba am: 08b46f3431" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Track external/icu API changes for factory registration" into nyc-dev am:...
Neil Fuller [Thu, 5 May 2016 10:03:19 +0000 (10:03 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev am: 00e8fef0ba
am: 08b46f3431

* commit '08b46f3431163701ad08d48a0dacfb2a4fe42ab2':
  Track external/icu API changes for factory registration

Change-Id: I205e42f97d4e2ec45c2bffa83c3e1aa7356d6c50

8 years agoMerge "Track external/icu API changes for factory registration" into nyc-dev am:...
Neil Fuller [Thu, 5 May 2016 10:03:16 +0000 (10:03 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev am: 00e8fef0ba
am: bd6e38e6b7

* commit 'bd6e38e6b70a0b262414074f393b79dd0de5900d':
  Track external/icu API changes for factory registration

Change-Id: I3b27d1649ad5b89bac0ec52861960a019be15e81

8 years agoMerge "Track external/icu API changes for factory registration" into nyc-dev
Neil Fuller [Thu, 5 May 2016 10:00:42 +0000 (10:00 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev
am: 00e8fef0ba

* commit '00e8fef0ba61cd57cd36beeb81ae1eb20ac04eaf':
  Track external/icu API changes for factory registration

Change-Id: Ic4633d63e4d659b20eeeb4502a278a6fe365fd2a

8 years agoMerge "Track external/icu API changes for factory registration" into nyc-dev
Neil Fuller [Thu, 5 May 2016 10:00:40 +0000 (10:00 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev
am: 00e8fef0ba

* commit '00e8fef0ba61cd57cd36beeb81ae1eb20ac04eaf':
  Track external/icu API changes for factory registration

Change-Id: Ic1e5a3d6b7a3479a2feec75e1729411485eab1ad

8 years agoMerge "Track external/icu API changes for factory registration" into nyc-dev
Neil Fuller [Thu, 5 May 2016 09:54:45 +0000 (09:54 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev

8 years agoMerge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc...
Jaewan Kim [Thu, 5 May 2016 05:04:52 +0000 (05:04 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev am: 92e5a0dfa6
am: c1376252b4

* commit 'c1376252b4e9ee43c2acafc8855410d1bd23d3b6':

Change-Id: Ib523439c5e885049f0a0449421a6756ec7331d7c

8 years agoMerge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc...
Jaewan Kim [Thu, 5 May 2016 05:02:52 +0000 (05:02 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev am: 92e5a0dfa6
am: 79bcd943ef

* commit '79bcd943ef9341e5a1e4472d94e1eb21e43852e8':
  Fix thumbnail transition animation when Recents is shown with PIP

Change-Id: I235dc4af4f02c5e61f633cce32d61c91c809ff2e

8 years agoMerge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
Jaewan Kim [Thu, 5 May 2016 05:00:35 +0000 (05:00 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
am: 92e5a0dfa6

* commit '92e5a0dfa66f5cb454ce1bbe7246e806b2517e85':
  Fix thumbnail transition animation when Recents is shown with PIP

Change-Id: Ic224b416e8f9dfd77db59e5af92602ec9b1f1777

8 years agoMerge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
Jaewan Kim [Thu, 5 May 2016 05:00:17 +0000 (05:00 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
am: 92e5a0dfa6

* commit '92e5a0dfa66f5cb454ce1bbe7246e806b2517e85':
  Fix thumbnail transition animation when Recents is shown with PIP

Change-Id: I21de87dfcd366b9622b1d55fa88b5c9b08289b1d

8 years agoMerge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
Jaewan Kim [Thu, 5 May 2016 04:57:33 +0000 (04:57 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev

8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412
Alan Viverette [Thu, 5 May 2016 02:34:28 +0000 (02:34 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412
am: 1a1301286c

* commit '1a1301286cc16052e58ee1508ef62a19b6b03786':

Change-Id: I1432e02e06cb5d477208fce9385510d7a27c903a

8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412
Alan Viverette [Thu, 5 May 2016 02:32:29 +0000 (02:32 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412
am: 9204810e66

* commit '9204810e668d14e3d739726da996a89488e7e6d9':
  Always assign leftover pixels to last weighted child

Change-Id: I5fe075d83f6b299511a92cc5721f0b68614f6e80

8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev
Alan Viverette [Thu, 5 May 2016 02:30:18 +0000 (02:30 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502

8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev
Alan Viverette [Thu, 5 May 2016 02:29:57 +0000 (02:29 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: Ibfaa979ba23c204172015fae11a767be8a4852dc

8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev
Alan Viverette [Thu, 5 May 2016 02:26:44 +0000 (02:26 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev

8 years agoMerge "Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e011...
Android Build Merger (Role) [Thu, 5 May 2016 02:18:42 +0000 (02:18 +0000)]
Merge "Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a am: b78624dabf" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a
Jorim Jaggi [Thu, 5 May 2016 02:18:19 +0000 (02:18 +0000)]
Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a
am: b78624dabf

* commit 'b78624dabf9914e2ba9f9a196377bceb917d77f2':

Change-Id: Ie6b529323b624e10be32388e25004de6d545eac4

8 years agoMerge "Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e011...
Android Build Merger (Role) [Thu, 5 May 2016 02:16:43 +0000 (02:16 +0000)]
Merge "Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a am: b78624dabf" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a
Jorim Jaggi [Thu, 5 May 2016 02:16:18 +0000 (02:16 +0000)]
Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a
am: b78624dabf

* commit 'b78624dabf9914e2ba9f9a196377bceb917d77f2':
  Don't resize task when dismissing docked stack

Change-Id: Ifa8f3283435fd20c8801bce9a08298cf60930a78

8 years agoMerge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a
Jorim Jaggi [Thu, 5 May 2016 02:16:00 +0000 (02:16 +0000)]
Merge "Don\'t resize task when dismissing docked stack" into nyc-dev am: 4e0114742a
am: 9de2772cf0

* commit '9de2772cf0733f8a2dae490e20c8d2cf4d233bd8':
  Don't resize task when dismissing docked stack

Change-Id: I20a55fe53b887c3e1be518ddb82a40633818e113

8 years agoMerge "Don\'t resize task when dismissing docked stack" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 02:13:27 +0000 (02:13 +0000)]
Merge "Don\'t resize task when dismissing docked stack" into nyc-dev
am: 4e0114742a

* commit '4e0114742a86ba3c3c9fb9cc536823be44712c05':
  Don't resize task when dismissing docked stack

Change-Id: Ia28a84872cd5652b8bcd1caa95894d91d5ef3ae6

8 years agoMerge "Don\'t resize task when dismissing docked stack" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 02:12:43 +0000 (02:12 +0000)]
Merge "Don\'t resize task when dismissing docked stack" into nyc-dev
am: 4e0114742a

* commit '4e0114742a86ba3c3c9fb9cc536823be44712c05':
  Don't resize task when dismissing docked stack

Change-Id: Id7b8e6ada280dab2d14a99df4a0447355d0270f2

8 years agoMerge "Don't resize task when dismissing docked stack" into nyc-dev
TreeHugger Robot [Thu, 5 May 2016 02:07:26 +0000 (02:07 +0000)]
Merge "Don't resize task when dismissing docked stack" into nyc-dev

8 years agoMerge "docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f...
Android Build Merger (Role) [Thu, 5 May 2016 01:09:20 +0000 (01:09 +0000)]
Merge "docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb am: 6f9f75e106 am: 447a2c97ac" into nyc-mr1-dev-plus-aosp

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb...
Andrew Solovay [Thu, 5 May 2016 01:08:57 +0000 (01:08 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb am: 6f9f75e106
am: 447a2c97ac

* commit '447a2c97ac73e9faf1cbb12bd3943c1f27a5f26a':

Change-Id: I3394971189faace3c7bc1e22ca653eadcdb2fbe1

8 years agoMerge "docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f...
Android Build Merger (Role) [Thu, 5 May 2016 01:07:09 +0000 (01:07 +0000)]
Merge "docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb am: 6f9f75e106 am: 447a2c97ac" into nyc-mr1-dev-plus-aosp

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb...
Andrew Solovay [Thu, 5 May 2016 01:06:40 +0000 (01:06 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb am: 6f9f75e106
am: 447a2c97ac

* commit '447a2c97ac73e9faf1cbb12bd3943c1f27a5f26a':
  docs: Fixing bad URL in libraries TOC

Change-Id: I260593a7f0ea84e4e992b88fc0e19cbc3e8a7460

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb...
Andrew Solovay [Thu, 5 May 2016 01:06:37 +0000 (01:06 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb am: 6f9f75e106
am: 69750bf740

* commit '69750bf74022f06a89f8983a7e42ea0af385cfe0':
  docs: Fixing bad URL in libraries TOC

Change-Id: Ibc17bf1252ee7727e71a65601a550396af0327e9

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb
Andrew Solovay [Thu, 5 May 2016 01:04:14 +0000 (01:04 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb
am: 6f9f75e106

* commit '6f9f75e1063d282c933ede862fa7ea9371a2f310':
  docs: Fixing bad URL in libraries TOC

Change-Id: I7e8aa169e3833b253c4956b428c6dbe70ef446b3

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb
Andrew Solovay [Thu, 5 May 2016 01:04:12 +0000 (01:04 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb
am: 6f9f75e106

* commit '6f9f75e1063d282c933ede862fa7ea9371a2f310':
  docs: Fixing bad URL in libraries TOC

Change-Id: I631c9d39d626e61d0abb3feabbd33c873a797f9b

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd
Andrew Solovay [Thu, 5 May 2016 01:01:58 +0000 (01:01 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd
am: 35515f4fdb

* commit '35515f4fdb9e0c5ae4618a8b55addd2e24cf6983':
  docs: Fixing bad URL in libraries TOC

Change-Id: I930f38f695dc831983afc414799cbfc9398ff867

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4
Andrew Solovay [Thu, 5 May 2016 00:59:37 +0000 (00:59 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4
am: d9092978cd

* commit 'd9092978cde2bfdb291c5a5edbec4c28404a8e0d':
  docs: Fixing bad URL in libraries TOC

Change-Id: I25103954c34a912c75e9cbbda01aeb007f03b410

8 years agodocs: Fixing bad URL in libraries TOC
Andrew Solovay [Thu, 5 May 2016 00:54:48 +0000 (00:54 +0000)]
docs: Fixing bad URL in libraries TOC
am: 084d99bfd4

* commit '084d99bfd4938689e6394a8f3bcb5d261b852f93':
  docs: Fixing bad URL in libraries TOC

Change-Id: I98fabe110ba52c1f411cf2c6ab27ae9d86997dce

8 years agoDon't resize task when dismissing docked stack
Jorim Jaggi [Thu, 5 May 2016 00:24:47 +0000 (17:24 -0700)]
Don't resize task when dismissing docked stack

Make sure to "freeze" bounds while dismissing the docked stack by
either maximizing or minimizing it.

Bug: 28196862
Change-Id: Ifcd9deda340de8bc46df949df2fa1049e2f45f92

8 years agoMerge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: ddbe7...
Android Build Merger (Role) [Thu, 5 May 2016 00:13:48 +0000 (00:13 +0000)]
Merge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: ddbe7b2c05" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fixing issue with passing arguments to toggle recents. am: ae165154a2 am:...
Android Build Merger (Role) [Thu, 5 May 2016 00:13:32 +0000 (00:13 +0000)]
Merge "Fixing issue with passing arguments to toggle recents. am: ae165154a2 am: 6b7cde5a7a" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add dump information for divider" into nyc-dev am: f28b23416e
Jorim Jaggi [Thu, 5 May 2016 00:13:06 +0000 (00:13 +0000)]
Merge "Add dump information for divider" into nyc-dev am: f28b23416e
am: ddbe7b2c05

* commit 'ddbe7b2c0508adcdb77baf41998bd9e02aecad2d':

Change-Id: Iad4eea5c1dd6026c744dffee5d0b9059ad8f258a

8 years agoFixing issue with passing arguments to toggle recents. am: ae165154a2
Winson [Thu, 5 May 2016 00:13:02 +0000 (00:13 +0000)]
Fixing issue with passing arguments to toggle recents. am: ae165154a2
am: 6b7cde5a7a

* commit '6b7cde5a7abf595c1e959cc2b48eda4faa10978a':

Change-Id: Ib9f7853b8d7da4691866e6d960dd385281238485

8 years agoMerge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: ddbe7...
Android Build Merger (Role) [Thu, 5 May 2016 00:11:25 +0000 (00:11 +0000)]
Merge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: ddbe7b2c05" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fixing issue with passing arguments to toggle recents. am: ae165154a2 am:...
Android Build Merger (Role) [Thu, 5 May 2016 00:11:10 +0000 (00:11 +0000)]
Merge "Fixing issue with passing arguments to toggle recents. am: ae165154a2 am: 6b7cde5a7a" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: e1241...
Android Build Merger (Role) [Thu, 5 May 2016 00:11:00 +0000 (00:11 +0000)]
Merge "Merge "Add dump information for divider" into nyc-dev am: f28b23416e am: e124190bc1" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fixing regression in enter-recents state. am: d7cb517b4c am: e83439d066" into...
Android Build Merger (Role) [Thu, 5 May 2016 00:10:52 +0000 (00:10 +0000)]
Merge "Fixing regression in enter-recents state. am: d7cb517b4c am: e83439d066" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add dump information for divider" into nyc-dev am: f28b23416e
Jorim Jaggi [Thu, 5 May 2016 00:10:10 +0000 (00:10 +0000)]
Merge "Add dump information for divider" into nyc-dev am: f28b23416e
am: ddbe7b2c05

* commit 'ddbe7b2c0508adcdb77baf41998bd9e02aecad2d':
  Add dump information for divider

Change-Id: If6dce58e61b9b78307f90de094dce4947ae6ca86

8 years agoFixing issue with passing arguments to toggle recents. am: ae165154a2
Winson [Thu, 5 May 2016 00:10:07 +0000 (00:10 +0000)]
Fixing issue with passing arguments to toggle recents. am: ae165154a2
am: 6b7cde5a7a

* commit '6b7cde5a7abf595c1e959cc2b48eda4faa10978a':
  Fixing issue with passing arguments to toggle recents.

Change-Id: I95ac01afa60935018ac0b7869470968f33570262

8 years agoMerge "Add dump information for divider" into nyc-dev am: f28b23416e
Jorim Jaggi [Thu, 5 May 2016 00:10:03 +0000 (00:10 +0000)]
Merge "Add dump information for divider" into nyc-dev am: f28b23416e
am: e124190bc1

* commit 'e124190bc1a720930750195636ba6005ef871aa2':
  Add dump information for divider

Change-Id: I99a0d8791106057180880bff516e4d442ebdd8d1

8 years agoFixing regression in enter-recents state. am: d7cb517b4c
Winson [Thu, 5 May 2016 00:10:01 +0000 (00:10 +0000)]
Fixing regression in enter-recents state. am: d7cb517b4c
am: e83439d066

* commit 'e83439d06655600909ad15f7773d19b5a8cbfa02':
  Fixing regression in enter-recents state.

Change-Id: I6e772b0822c5eff42c478390663b0c1e5bc6cf22

8 years agoFixing issue with passing arguments to toggle recents. am: ae165154a2
Winson [Thu, 5 May 2016 00:10:00 +0000 (00:10 +0000)]
Fixing issue with passing arguments to toggle recents. am: ae165154a2
am: 902b00adf8

* commit '902b00adf8712fb46323bb4b19607b04284499a4':
  Fixing issue with passing arguments to toggle recents.

Change-Id: Ie51738bef003c6df3d26932aecf4d53d5115667c

8 years agoFixing regression in enter-recents state. am: d7cb517b4c
Winson [Thu, 5 May 2016 00:09:57 +0000 (00:09 +0000)]
Fixing regression in enter-recents state. am: d7cb517b4c
am: af35d46cf4

* commit 'af35d46cf4c6dc8b100559cbd3ec036092f840c8':
  Fixing regression in enter-recents state.

Change-Id: I377fc39bd02e589e04179a360966fe8bb02d8474

8 years agoMerge "Add dump information for divider" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 00:05:15 +0000 (00:05 +0000)]
Merge "Add dump information for divider" into nyc-dev
am: f28b23416e

* commit 'f28b23416eb607734d255b0c5595674ee3b7b949':
  Add dump information for divider

Change-Id: I28eb13cc375bf538ae7b05685830c39df953b685

8 years agoFixing issue with passing arguments to toggle recents.
Winson [Thu, 5 May 2016 00:05:11 +0000 (00:05 +0000)]
Fixing issue with passing arguments to toggle recents.
am: ae165154a2

* commit 'ae165154a2a80ef160927d81a0b898660153f25e':
  Fixing issue with passing arguments to toggle recents.

Change-Id: I1a088e27a5da8d4fe74fd477e73f846fbeb2ffbc

8 years agoMerge "Add dump information for divider" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 00:05:07 +0000 (00:05 +0000)]
Merge "Add dump information for divider" into nyc-dev
am: f28b23416e

* commit 'f28b23416eb607734d255b0c5595674ee3b7b949':
  Add dump information for divider

Change-Id: I60e1131190a272c799a8807b11123aa46c999c89

8 years agoFixing regression in enter-recents state.
Winson [Thu, 5 May 2016 00:05:06 +0000 (00:05 +0000)]
Fixing regression in enter-recents state.
am: d7cb517b4c

* commit 'd7cb517b4ce10fa98213da18ccdb2261fb797f7c':
  Fixing regression in enter-recents state.

Change-Id: I60bde13a5a39ad88505d1710bb9358627404edaa