OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d5...
Chris Banes [Sat, 23 Apr 2016 07:16:46 +0000 (07:16 +0000)]
Merge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: d807891" into nyc-mr1-dev-plus-aosp
am: b36f45d

* commit 'b36f45dd7229f9ee9dfc10761047cdabcd6104f6':

Change-Id: I1939a096ba4122c96aaed7b48d30ccf649c9a415

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b...
Chris Banes [Sat, 23 Apr 2016 07:16:42 +0000 (07:16 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: bdc6966
am: 9465c72

* commit '9465c720f53d3ca7d0fa2311c887b727db3fdbaf':
  Make AbsSavedState read using given ClassLoader

Change-Id: Ia1ee1a8609c3cf7815e596cc74658dc4bb04c01e

8 years agoMerge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d5...
Android Build Merger (Role) [Sat, 23 Apr 2016 07:13:12 +0000 (07:13 +0000)]
Merge "Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b am: d807891" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
Chris Banes [Sat, 23 Apr 2016 07:12:46 +0000 (07:12 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
am: d807891

* commit 'd80789117cf2f41de41e4e4d57c2964ae989c458':
  Make AbsSavedState read using given ClassLoader

Change-Id: If344423f5f4ea13a5f5b442e8a959317fe195151

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
Chris Banes [Sat, 23 Apr 2016 07:12:41 +0000 (07:12 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev am: b02d51b
am: bdc6966

* commit 'bdc696607baff34fa862cc910060d992a49e6ef2':
  Make AbsSavedState read using given ClassLoader

Change-Id: Ib99aa96b057ba5e8fc440b54f2d21a57e1eab573

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:09:24 +0000 (07:09 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
  Make AbsSavedState read using given ClassLoader

Change-Id: I680a362e229c7ebbd42f344fa7446aff86fa98ae

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:09:22 +0000 (07:09 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev
am: b02d51b

* commit 'b02d51b3d31b1a49ddc7c7e7db97b576d6e4f78f':
  Make AbsSavedState read using given ClassLoader

Change-Id: If0e2679ca978a0423ff26e7b0f416d09c50ab70b

8 years agoMerge "Make AbsSavedState read using given ClassLoader" into nyc-dev
Chris Banes [Sat, 23 Apr 2016 07:04:20 +0000 (07:04 +0000)]
Merge "Make AbsSavedState read using given ClassLoader" into nyc-dev

8 years agoMerge "Merge "Fix content description for notification icons" into nyc-dev am: eefff3...
TreeHugger Robot [Sat, 23 Apr 2016 01:56:49 +0000 (01:56 +0000)]
Merge "Merge "Fix content description for notification icons" into nyc-dev am: eefff37 am: 3a8380d" into nyc-mr1-dev-plus-aosp
am: b3bf0ad

* commit 'b3bf0ad83d932d0b7b0d2227bef1518ae3956e85':

Change-Id: I7e0ddd4a15f317495b24824b121e58fd083957ba

8 years agoMerge "Fix content description for notification icons" into nyc-dev am: eefff37 am...
Adrian Roos [Sat, 23 Apr 2016 01:56:46 +0000 (01:56 +0000)]
Merge "Fix content description for notification icons" into nyc-dev am: eefff37 am: 18a98c1
am: a04e33a

* commit 'a04e33a2dc2f0a2ac7b9966b3739d9142c1bd749':
  Fix content description for notification icons

Change-Id: Id2c9b4c5cd490254380c4a98ed65ef48fdbf91b9

8 years agoMerge "Merge "Fix content description for notification icons" into nyc-dev am: eefff3...
Android Build Merger (Role) [Sat, 23 Apr 2016 01:54:19 +0000 (01:54 +0000)]
Merge "Merge "Fix content description for notification icons" into nyc-dev am: eefff37 am: 3a8380d" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fix content description for notification icons" into nyc-dev am: eefff37
TreeHugger Robot [Sat, 23 Apr 2016 01:53:54 +0000 (01:53 +0000)]
Merge "Fix content description for notification icons" into nyc-dev am: eefff37
am: 3a8380d

* commit '3a8380db1056af423d784845a153855875a03c11':
  Fix content description for notification icons

Change-Id: Ief4bd33a91e3526adc3757497a29ab5cb2185426

8 years agoMerge "Fix content description for notification icons" into nyc-dev am: eefff37
TreeHugger Robot [Sat, 23 Apr 2016 01:53:52 +0000 (01:53 +0000)]
Merge "Fix content description for notification icons" into nyc-dev am: eefff37
am: 18a98c1

* commit '18a98c1fd8ba76e43e96159fb803d27b7b6774c3':
  Fix content description for notification icons

Change-Id: I78e8cfbb67ff535e18fcd6862c6353519e33cfcd

8 years agoMerge "Fix content description for notification icons" into nyc-dev
Adrian Roos [Sat, 23 Apr 2016 01:51:02 +0000 (01:51 +0000)]
Merge "Fix content description for notification icons" into nyc-dev
am: eefff37

* commit 'eefff3742de62101341128a32b227a25ed22df06':
  Fix content description for notification icons

Change-Id: I35b24b57ffe34f81007cf6fb7ae860998b6ca65c

8 years agoMerge "Fix content description for notification icons" into nyc-dev
Adrian Roos [Sat, 23 Apr 2016 01:51:01 +0000 (01:51 +0000)]
Merge "Fix content description for notification icons" into nyc-dev
am: eefff37

* commit 'eefff3742de62101341128a32b227a25ed22df06':
  Fix content description for notification icons

Change-Id: I1b150df0a92f47d2d893c18ada72020601527ed8

8 years agoMerge "Fix content description for notification icons" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 01:45:00 +0000 (01:45 +0000)]
Merge "Fix content description for notification icons" into nyc-dev

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa...
Amith Yamasani [Sat, 23 Apr 2016 01:13:06 +0000 (01:13 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa am: 074139b
am: e598d62

* commit 'e598d62bd42dfbb7498b557ac1c49bdfb669004f':

Change-Id: Idfef0f640e1e76f000fd203ee4ecf5e7dcb30447

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa...
Amith Yamasani [Sat, 23 Apr 2016 01:07:35 +0000 (01:07 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa am: 40411c1
am: 1032d86

* commit '1032d86f92acc008c309a533370eca668a4d20eb':
  Fix a regression in assist when context is disabled

Change-Id: Id72ae383f519eb8d942005d5d657f6c337943a78

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
TreeHugger Robot [Sat, 23 Apr 2016 01:07:34 +0000 (01:07 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
am: 074139b

* commit '074139b878315913ba2ae78aa0d212cade94e02c':

Change-Id: Ibd1f925feffc7c25561eea7eb13f45482d7d2717

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
TreeHugger Robot [Sat, 23 Apr 2016 01:04:51 +0000 (01:04 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev am: c3c45fa
am: 40411c1

* commit '40411c158c8b071ba9175f514b1fa370ff438cc5':
  Fix a regression in assist when context is disabled

Change-Id: I5beebccebd76317f06e545bbea57e999b8cdbe06

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
Amith Yamasani [Sat, 23 Apr 2016 01:02:02 +0000 (01:02 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
  Fix a regression in assist when context is disabled

Change-Id: Ib12c5e865814f8b3c54c3e862af2191315bbc6e5

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
Amith Yamasani [Sat, 23 Apr 2016 01:01:58 +0000 (01:01 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev
am: c3c45fa

* commit 'c3c45fa2e0c5779e3e847dd4878c2a9d1ba2fb36':
  Fix a regression in assist when context is disabled

Change-Id: I6209180e67e91ac264e50be957d87c2d897bcc3c

8 years agoMerge "Fix a regression in assist when context is disabled" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 00:56:10 +0000 (00:56 +0000)]
Merge "Fix a regression in assist when context is disabled" into nyc-dev

8 years agoMerge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a7...
Adam Lesinski [Sat, 23 Apr 2016 00:29:39 +0000 (00:29 +0000)]
Merge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 2494361" into nyc-mr1-dev-plus-aosp
am: 183a0ea

* commit '183a0eab0fe855c1e7473f46f81821ce98e91735':

Change-Id: I2113f779c79e0e0b1bd5a37af9033e70a6e1a0d1

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717...
Adam Lesinski [Sat, 23 Apr 2016 00:29:37 +0000 (00:29 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 8414b87
am: 34e3a5f

* commit '34e3a5f72daa73f69956aace6583370d82902171':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I08d997bc9c0fc96c54eee8dda69e3c62005b38e5

8 years agoMerge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a7...
Android Build Merger (Role) [Sat, 23 Apr 2016 00:27:18 +0000 (00:27 +0000)]
Merge "Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 2494361" into nyc-mr1-dev-plus-aosp

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
Adam Lesinski [Sat, 23 Apr 2016 00:26:48 +0000 (00:26 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
am: 2494361

* commit '2494361b0ba220038f24613da21f3e0fcdaacc1b':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I4b839bc544847b00fabbb6c5e21ac6bff82741a5

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
Adam Lesinski [Sat, 23 Apr 2016 00:26:46 +0000 (00:26 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717
am: 8414b87

* commit '8414b87f6cfc122af50ecddb5082f691fccf2c4c':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I110b1dbf74db6701e112accb21471fed05c194af

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
Adam Lesinski [Sat, 23 Apr 2016 00:23:59 +0000 (00:23 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Ie2533ead98202eb9c12daa7032fe98ffd4971c56

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
Adam Lesinski [Sat, 23 Apr 2016 00:23:56 +0000 (00:23 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Iaab0fd5bf59399a3ef2bfe2eb3904ec13691e186

8 years agoMerge "Merge "PIP: Changed the wording and background of the PIP onboarding screen...
Jaewan Kim [Sat, 23 Apr 2016 00:22:59 +0000 (00:22 +0000)]
Merge "Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd am: c9b8b96" into nyc-mr1-dev-plus-aosp
am: ffb6800

* commit 'ffb6800c7a3e19b25cf4d7975f434ff9dc02f04f':

Change-Id: I928b1a0247b1b6525995b8218922aa85fda8980f

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:22:52 +0000 (00:22 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd am: b96a785
am: 9b0c60b

* commit '9b0c60b4b26c015255aa1378743a742e0dfba1b1':
  PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: Icbcbe833e1ac31612dad0aee46ea06b6e12e37fd

8 years agoMerge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
Adam Lesinski [Sat, 23 Apr 2016 00:20:09 +0000 (00:20 +0000)]
Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev

8 years agoMerge "Merge "PIP: Changed the wording and background of the PIP onboarding screen...
Android Build Merger (Role) [Sat, 23 Apr 2016 00:16:59 +0000 (00:16 +0000)]
Merge "Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd am: c9b8b96" into nyc-mr1-dev-plus-aosp

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:16:36 +0000 (00:16 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd
am: c9b8b96

* commit 'c9b8b96087fc7f7db59ece6ce4d66f49ddf3e512':
  PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: I451e2da82a3bc98403e404d29300ef204f746cab

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:16:09 +0000 (00:16 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev am: b27a5fd
am: b96a785

* commit 'b96a785916d444d9a4372f3f7b9af1f5beef1140':
  PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: If580b601b7f5829ab2638fddf021861793355255

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2 am: 7b12283
Christopher Tate [Sat, 23 Apr 2016 00:13:32 +0000 (00:13 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2 am: 7b12283
am: da5f08d

* commit 'da5f08db86332a82821450ca6f29a33ef6050d1a':

Change-Id: Icd9b1fa5058b1db505b5ca6bad578bbd5d7fe58d

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2 am: 352a718
Christopher Tate [Sat, 23 Apr 2016 00:13:28 +0000 (00:13 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2 am: 352a718
am: 4bbae5e

* commit '4bbae5eeedb9fddf9f1cd85d18000f475e0b78d3':
  Raise native-crash socket timeout

Change-Id: Ifd1a1ee42161f17535f23db78fb6c56d66e4c998

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:13:14 +0000 (00:13 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev
am: b27a5fd

* commit 'b27a5fd45b2ae461cfa61dfff52e897d236d0d26':
  PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: I9eeaf9e51346ad900945a927c1c05816d9172de4

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:13:09 +0000 (00:13 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev
am: b27a5fd

* commit 'b27a5fd45b2ae461cfa61dfff52e897d236d0d26':
  PIP: Changed the wording and background of the PIP onboarding screen

Change-Id: I121a159de9c5599ea3769ecc3c6cd50eebadd07f

8 years agoFix content description for notification icons
Adrian Roos [Sat, 23 Apr 2016 00:09:27 +0000 (17:09 -0700)]
Fix content description for notification icons

Change-Id: Icb4c6d8a77211d0c8922e28958609a332b19dfcc
Fixes: 27552350

8 years agoMerge "PIP: Changed the wording and background of the PIP onboarding screen" into...
Jaewan Kim [Sat, 23 Apr 2016 00:04:54 +0000 (00:04 +0000)]
Merge "PIP: Changed the wording and background of the PIP onboarding screen" into nyc-dev

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2
Chris Tate [Fri, 22 Apr 2016 23:59:22 +0000 (23:59 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2
am: 7b12283

* commit '7b12283f586c52e473a53ec6fa9641ba60463521':

Change-Id: I072af6c06f671b7b7f64e7056778486a8934308e

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2
Chris Tate [Fri, 22 Apr 2016 23:57:11 +0000 (23:57 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev am: aa1b2e2
am: 352a718

* commit '352a71807cb9d24863afdb10fd4cd76733f9ed43':
  Raise native-crash socket timeout

Change-Id: I15f7c2b1179553bc3a097fe9280ba4d7fc967145

8 years agoMerge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev...
Felipe Leme [Fri, 22 Apr 2016 23:52:30 +0000 (23:52 +0000)]
Merge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044 am: 0b43e90" into nyc-mr1-dev-plus-aosp
am: ec1585f

* commit 'ec1585f89168ec5ec05b053f3dae9394dbe07a79':

Change-Id: I209d3c4ee252be08ed1aba832ebfa304db038bc3

8 years agoMerge "Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc...
Felipe Leme [Fri, 22 Apr 2016 23:52:27 +0000 (23:52 +0000)]
Merge "Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am: 19fa93f am: da2868b" into nyc-mr1-dev-plus-aosp
am: c65a2bd

* commit 'c65a2bd3fd7e09690be68773f5d3364ab18f6723':

Change-Id: Id01fdbc08eb7d4049a307f8731b2e555b855757d

8 years agoMerge "Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev...
Carlos Valdivia [Fri, 22 Apr 2016 23:52:23 +0000 (23:52 +0000)]
Merge "Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67 am: 9ce75b3" into nyc-mr1-dev-plus-aosp
am: d9495d1

* commit 'd9495d1af99a7ed99f86d74d221ca28df3028e2e':

Change-Id: I5a32509469e053aa3486e71ecfc274ae50593af8

8 years agoPIP: Changed the wording and background of the PIP onboarding screen
Jaewan Kim [Thu, 21 Apr 2016 12:16:28 +0000 (21:16 +0900)]
PIP: Changed the wording and background of the PIP onboarding screen

Bug: 28300868
Change-Id: I73e465ddac5520e0b70098bf6a39fb85d59ad0f9

8 years agoMerge "Merge "Disable view recycling to avoid passing wrong type of view to Item...
Garfield Tan [Fri, 22 Apr 2016 23:51:39 +0000 (23:51 +0000)]
Merge "Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3 am: b86c38f" into nyc-mr1-dev-plus-aosp
am: 74c24af

* commit '74c24afd2d0e5c0fbfe8a7e5ba0f66db3964ad5a':

Change-Id: Ibd09f3812eb98f8c14202abd77c770a467f4d1e5

8 years agoMerge "Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev...
Ta-wei Yen [Fri, 22 Apr 2016 23:51:25 +0000 (23:51 +0000)]
Merge "Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48 am: da83b75" into nyc-mr1-dev-plus-aosp
am: 95c3eda

* commit '95c3eda0fda18386657381320068dbeb7e5f6b2a':

Change-Id: I52e4a673930d2fc4926d2d67cb233083f9a005e9

8 years agoMerge "Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47...
Winson [Fri, 22 Apr 2016 23:51:12 +0000 (23:51 +0000)]
Merge "Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef am: 643146b" into nyc-mr1-dev-plus-aosp
am: d821d35

* commit 'd821d35a4ad12ab659cc9c6fa98ba28fc1d0ef93':

Change-Id: I90f3df757b6b6b71c76dfbc3588488fd1b1583dd

8 years agoMerge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev...
Felipe Leme [Fri, 22 Apr 2016 23:51:02 +0000 (23:51 +0000)]
Merge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044 am: 7c7af7b" into nyc-mr1-dev-plus-aosp
am: d7df808

* commit 'd7df808bf7c39261c1aae1faefba5ec36deced02':
  Show a toast when details cannot be added to zip file.

Change-Id: I6c923972ac961567bffe38926ec8946802dce035

8 years agoMerge "Merge "Force a relayout when task is resized while not drag resizing." into...
Chong Zhang [Fri, 22 Apr 2016 23:50:48 +0000 (23:50 +0000)]
Merge "Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev am: b6cd42a am: 9541039" into nyc-mr1-dev-plus-aosp
am: 7c26404

* commit '7c26404735d3ed37873050418400dbe9b3f012c9':

Change-Id: I112e8107c36f6057a15f701628e6c1fc2ef1ebeb

8 years agoMerge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am...
Felipe Leme [Fri, 22 Apr 2016 23:50:34 +0000 (23:50 +0000)]
Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am: 19fa93f am: ea13253
am: 63aa7a0

* commit '63aa7a0a782cc9c6b297ea1408cd2c7a730c68bc':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: Ib01f184467308320df8cfa8c06fd6a932d119667

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba6...
Carlos Valdivia [Fri, 22 Apr 2016 23:50:17 +0000 (23:50 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67 am: 2ab3256
am: b255a2a

* commit 'b255a2afb4d3aae35c87d9f6f719bd4f188279da':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: Id9e1329e3356a1360be4a13b7dae9930f52c36f4

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield, Tan [Fri, 22 Apr 2016 23:50:00 +0000 (23:50 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3 am: 105fba9
am: f6b562d

* commit 'f6b562d20d64f4f7e8d7ad9f83e27a01f2aa807f':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: I9729d7de6472991054645ad6c61b8703730c0c8c

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a4...
Ta-wei Yen [Fri, 22 Apr 2016 23:49:40 +0000 (23:49 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48 am: e85b334
am: c63cf69

* commit 'c63cf6970729a349f71247f392e469a3d4f0598b':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I29b512ad4986cb52e00f33b9c418ec05a28dbb80

8 years agoFixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef...
Winson [Fri, 22 Apr 2016 23:48:36 +0000 (23:48 +0000)]
Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef am: 1769e07
am: 7e0b7e1

* commit '7e0b7e1ed00916ac9d988a1d646b4f80c2bc808f':
  Fixing issue with swipe-dismiss animation clobbering home animation.

Change-Id: I6baabb8f244d262a1f936aa2252259e8dbe543f0

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev...
Chong Zhang [Fri, 22 Apr 2016 23:48:09 +0000 (23:48 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev am: b6cd42a am: b279889
am: d782bf9

* commit 'd782bf9c85dd2026b210b87f9d8d653e76963b04':
  Force a relayout when task is resized while not drag resizing.

Change-Id: Ic04a2ba0730483b500b02c801d7474fb2fa04145

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev
Christopher Tate [Fri, 22 Apr 2016 23:44:57 +0000 (23:44 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
  Raise native-crash socket timeout

Change-Id: Ie048bfcf8a0843375517f413093a604053bd255e

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev
Christopher Tate [Fri, 22 Apr 2016 23:44:54 +0000 (23:44 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev
am: aa1b2e2

* commit 'aa1b2e2d4e47ae186df31ffe10f1ed05b951b753':
  Raise native-crash socket timeout

Change-Id: I7e763182c48f7ec1fd36196e4ecf991cd602e500

8 years agoMerge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:43:08 +0000 (23:43 +0000)]
Merge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044 am: 0b43e90" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:42:53 +0000 (23:42 +0000)]
Merge "Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am: 19fa93f am: da2868b" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:42:40 +0000 (23:42 +0000)]
Merge "Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67 am: 9ce75b3" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Disable view recycling to avoid passing wrong type of view to Item...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:42:30 +0000 (23:42 +0000)]
Merge "Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3 am: b86c38f" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:42:19 +0000 (23:42 +0000)]
Merge "Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48 am: da83b75" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:42:06 +0000 (23:42 +0000)]
Merge "Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef am: 643146b" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:42:00 +0000 (23:42 +0000)]
Merge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044 am: 7c7af7b" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge "Force a relayout when task is resized while not drag resizing." into...
Android Build Merger (Role) [Fri, 22 Apr 2016 23:41:53 +0000 (23:41 +0000)]
Merge "Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev am: b6cd42a am: 9541039" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044
Felipe Leme [Fri, 22 Apr 2016 23:40:25 +0000 (23:40 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044
am: 0b43e90

* commit '0b43e90a0d68d3d3a129cbe9aaafdc33b04528e8':
  Show a toast when details cannot be added to zip file.

Change-Id: I1b719a38590cc8ff1a8bc85666e9cdc776cb5f45

8 years agoMerge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am...
Felipe Leme [Fri, 22 Apr 2016 23:40:17 +0000 (23:40 +0000)]
Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am: 19fa93f
am: da2868b

* commit 'da2868bb186fbc22d9e83dccadd3974e1813f7a4':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: I28549ff9e700f383e508b920ef1065f56c3fe8bd

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67
Carlos Valdivia [Fri, 22 Apr 2016 23:40:09 +0000 (23:40 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67
am: 9ce75b3

* commit '9ce75b31007fb5642108542a1c3821c36c3ec44c':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: Icab418d43c482030e0b313a8ddbdb553c36dc6c9

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield Tan [Fri, 22 Apr 2016 23:40:02 +0000 (23:40 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3
am: b86c38f

* commit 'b86c38f995b2b102e3e44184ac7ce3102cb94dea':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: I893081c411868d53ad0e7db42712c6defc706a35

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48
Ta-wei Yen [Fri, 22 Apr 2016 23:39:57 +0000 (23:39 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48
am: da83b75

* commit 'da83b755a3498d0d22539d8d6057a6898effa533':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I3aabbb2b2e7bc18d0720fe33f3487df3aa0d1ae3

8 years agoFixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef
Winson [Fri, 22 Apr 2016 23:39:50 +0000 (23:39 +0000)]
Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef
am: 643146b

* commit '643146bd885cbb52bf4feb6f330b8306bd801a8d':
  Fixing issue with swipe-dismiss animation clobbering home animation.

Change-Id: Iefaaca8e7f883efeac65aaf5d2ffc16e4b2baffd

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044
Felipe Leme [Fri, 22 Apr 2016 23:39:45 +0000 (23:39 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044
am: 7c7af7b

* commit '7c7af7bd710016636344437fee3038f5a98937d7':
  Show a toast when details cannot be added to zip file.

Change-Id: I1dcb137caa545ab13801b313b6d5d293408c0886

8 years agoMerge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am...
Felipe Leme [Fri, 22 Apr 2016 23:39:43 +0000 (23:39 +0000)]
Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev am: 19fa93f
am: ea13253

* commit 'ea13253b26524c2d58f9c21b412c295546749eeb':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: Ib7eb2120c0eaf26bc564b84c04699716b7abbc82

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev...
Chong Zhang [Fri, 22 Apr 2016 23:39:42 +0000 (23:39 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev am: b6cd42a
am: 9541039

* commit '954103966aeb5da86350786b295fa627a90ac5c2':
  Force a relayout when task is resized while not drag resizing.

Change-Id: I35c66fae7c34fc2db01886bbec6f8617b4115fbd

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67
Carlos Valdivia [Fri, 22 Apr 2016 23:39:41 +0000 (23:39 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev am: ffcba67
am: 2ab3256

* commit '2ab3256693d76312728167a8b0825272029004ba':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: I3eb823c4c9e27f8b18f067682dc45b7b1bdad1c5

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield Tan [Fri, 22 Apr 2016 23:39:38 +0000 (23:39 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev am: a5dd3f3
am: 105fba9

* commit '105fba9c08136192a56df867cbae3a11e492a448':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: Ibe7ec20b6f3ab7ae78a72547c12459307c5b2a92

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48
Ta-wei Yen [Fri, 22 Apr 2016 23:39:34 +0000 (23:39 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev am: 8431a48
am: e85b334

* commit 'e85b334c4160a60f3cc873bca32445561b0591a7':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: Ie313f719d49c1104c10ce4cce1e3356d6f7d7c0f

8 years agoFixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef
Winson [Fri, 22 Apr 2016 23:39:28 +0000 (23:39 +0000)]
Fixing issue with swipe-dismiss animation clobbering home animation. am: eca47ef
am: 1769e07

* commit '1769e0700089b6578b4a4d4c352b66e1dafb1224':
  Fixing issue with swipe-dismiss animation clobbering home animation.

Change-Id: I10308efa8fdf4a07a5ea9a206956e8bf4816bf82

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev...
Chong Zhang [Fri, 22 Apr 2016 23:39:22 +0000 (23:39 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev am: b6cd42a
am: b279889

* commit 'b279889b29a02ac06ee699d7947b15451b71e621':
  Force a relayout when task is resized while not drag resizing.

Change-Id: I0771f8b5a4e841330dec79b0d36fb026c96adafe

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:34:16 +0000 (23:34 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev
am: f39f044

* commit 'f39f04407e6c50d57aaa2358b2f46bc79a94cf4f':
  Show a toast when details cannot be added to zip file.

Change-Id: I09e6bece0225d01cf0eaafa8e64e88bfe40a7f0e

8 years agoMerge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:34:13 +0000 (23:34 +0000)]
Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev
am: 19fa93f

* commit '19fa93f64329e52ee69d06feffc979723210edd4':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: I18c0c3c623ec60e72e394c3d3a764e76991207a9

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
Carlos Valdivia [Fri, 22 Apr 2016 23:34:09 +0000 (23:34 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
am: ffcba67

* commit 'ffcba67bf9d25d9b8131f0aab9d5c8a4df492b69':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: Id79e67c8968bfaa87a5e43311ccf7dce99e84036

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:34:05 +0000 (23:34 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev
am: f39f044

* commit 'f39f04407e6c50d57aaa2358b2f46bc79a94cf4f':
  Show a toast when details cannot be added to zip file.

Change-Id: I076016897ee0af16f31619dd68f34e2db1fa31aa

8 years agoMerge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:34:04 +0000 (23:34 +0000)]
Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev
am: 19fa93f

* commit '19fa93f64329e52ee69d06feffc979723210edd4':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: I29f3491f3011827203a4cf026663aab0871b59fa

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield, Tan [Fri, 22 Apr 2016 23:34:04 +0000 (23:34 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev
am: a5dd3f3

* commit 'a5dd3f32403deb01ad260d50468f4daf8988ab01':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: I7848f1888db79bfdd2744d88b10ab797d5dae47f

8 years agoMerge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
Carlos Valdivia [Fri, 22 Apr 2016 23:34:02 +0000 (23:34 +0000)]
Merge "Rename GET_PASSWORD_PRIVILEGED and make it signature." into nyc-dev
am: ffcba67

* commit 'ffcba67bf9d25d9b8131f0aab9d5c8a4df492b69':
  Rename GET_PASSWORD_PRIVILEGED and make it signature.

Change-Id: I811b452d1b098e7d4606cb23b73918482db62eb6

8 years agoMerge "Disable view recycling to avoid passing wrong type of view to Item.bindView...
Garfield, Tan [Fri, 22 Apr 2016 23:33:59 +0000 (23:33 +0000)]
Merge "Disable view recycling to avoid passing wrong type of view to Item.bindView()." into nyc-dev
am: a5dd3f3

* commit 'a5dd3f32403deb01ad260d50468f4daf8988ab01':
  Disable view recycling to avoid passing wrong type of view to Item.bindView().

Change-Id: Id21f8e5546e28179954e39903baaebf5feff356a

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
Ta-wei Yen [Fri, 22 Apr 2016 23:33:59 +0000 (23:33 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I20ec57dbcaad08e02a9bcea40f52f077eff0e730

8 years agoMerge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
Ta-wei Yen [Fri, 22 Apr 2016 23:33:56 +0000 (23:33 +0000)]
Merge "Rename _BOOLEAN visual voicemail config keys to _BOOL" into nyc-dev
am: 8431a48

* commit '8431a48f779939a9c49538d054539321f9421e6c':
  Rename _BOOLEAN visual voicemail config keys to _BOOL

Change-Id: I5c176db61c64048973eae5377164eb658e8ede88

8 years agoFixing issue with swipe-dismiss animation clobbering home animation.
Winson [Fri, 22 Apr 2016 23:33:54 +0000 (23:33 +0000)]
Fixing issue with swipe-dismiss animation clobbering home animation.
am: eca47ef

* commit 'eca47ef813c49c8d8cee2cdc93c296bbc59ed73b':
  Fixing issue with swipe-dismiss animation clobbering home animation.

Change-Id: I7b18f4c0eaac8acbbac4b4d6ce4ad2b189095456

8 years agoFixing issue with swipe-dismiss animation clobbering home animation.
Winson [Fri, 22 Apr 2016 23:33:52 +0000 (23:33 +0000)]
Fixing issue with swipe-dismiss animation clobbering home animation.
am: eca47ef

* commit 'eca47ef813c49c8d8cee2cdc93c296bbc59ed73b':
  Fixing issue with swipe-dismiss animation clobbering home animation.

Change-Id: I6d03a7513a13cc2a88f86709b5cfc53adb222005

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev
Chong Zhang [Fri, 22 Apr 2016 23:33:48 +0000 (23:33 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev
am: b6cd42a

* commit 'b6cd42a925136f6354555c9c1033d20fbaadd139':
  Force a relayout when task is resized while not drag resizing.

Change-Id: Ieed7be623a63a6385a55eb62ca5bd9254b7b2a2c

8 years agoMerge "Force a relayout when task is resized while not drag resizing." into nyc-dev
Chong Zhang [Fri, 22 Apr 2016 23:33:48 +0000 (23:33 +0000)]
Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev
am: b6cd42a

* commit 'b6cd42a925136f6354555c9c1033d20fbaadd139':
  Force a relayout when task is resized while not drag resizing.

Change-Id: I789fcdd5a3b9ce0499d484d75dccf72d5a60fc43

8 years agoMerge "Raise native-crash socket timeout" into nyc-dev
Chris Tate [Fri, 22 Apr 2016 23:31:02 +0000 (23:31 +0000)]
Merge "Raise native-crash socket timeout" into nyc-dev

8 years agoMerge "AAPT2: ProGuard config for components in main dex."
Rohit Agrawal [Fri, 22 Apr 2016 23:28:37 +0000 (23:28 +0000)]
Merge "AAPT2: ProGuard config for components in main dex."

8 years agoMerge "Show a toast when details cannot be added to zip file." into nyc-dev
Felipe Leme [Fri, 22 Apr 2016 23:08:04 +0000 (23:08 +0000)]
Merge "Show a toast when details cannot be added to zip file." into nyc-dev