OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\"
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:33:53 +0000 (16:33 +0000)]
Merge \"Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b\"
am: cf5b00e6bc

Change-Id: Ib9462093cf0a6794950d3260b53754cb4c15389e

8 years agoMerge "Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b"
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 16:26:37 +0000 (16:26 +0000)]
Merge "Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b"

8 years agoTrack libcore change 4eed609c71648c069d8e83ec7001da29044d416b
Przemyslaw Szczepaniak [Mon, 4 Jul 2016 15:35:28 +0000 (16:35 +0100)]
Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b

Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:54:44 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:54:27 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:54:11 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:53:55 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:53:40 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:53:35 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:53:20 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:53:04 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:52:48 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:52:34 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:52:19 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:52:04 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:51:49 +0000 (04:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 1 Jul 2016 04:49:40 +0000 (04:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 02:59:37 +0000 (19:59 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iac4bc0fff7337c0971222e59b1f01e4a7ff3a1c5

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 02:53:56 +0000 (19:53 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I75df6be0cf865770568238976172e093082dca3d

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:41:48 +0000 (18:41 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ie154b48d77d2bc34ae1e71e1c3813c3ed2959eeb

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:39:36 +0000 (18:39 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia84a48847f77b72112f827ed67332fb1e293eea8

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:37:21 +0000 (18:37 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I8a6fa77b6a2227f5a33435fcd940909f52a84db3

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:19:39 +0000 (18:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I9d76dfe843b0824bfe6dcc403aeb71cd892a6d0d

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:17:21 +0000 (18:17 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Id899736cd68eb85928a9dd4552d7373096d14e08

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:15:03 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia8532224b0cc3135e4e848087b6de17a9b809a4d

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:09:03 +0000 (18:09 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I94c1eba5ff046d77f37195311a537cf5b4d5db51

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:04:47 +0000 (18:04 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I58c6883a1d26934d14b4f6330dd2adb530193dfd

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 01:02:15 +0000 (18:02 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Id3fb47cbfa7ff4482e09775ce67d949b3ab3ce8f

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 00:57:17 +0000 (17:57 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Iece1d9a50c8a3079af49f8fd79fa08ed63b3f8cd

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 00:54:54 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I252292d5c72798d7b96083720c10297f187514ef

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 00:52:29 +0000 (17:52 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I15e533393eb47890b62e320ccc9b1aa234a6aa21

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jul 2016 00:48:09 +0000 (17:48 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I98fa78ae9f908c5a7222b34da22cd0c32cbe5bd0

8 years agoMerge \"Changes for upgrade to OkHttp 2.7.5\"
Tobias Thierer [Thu, 30 Jun 2016 12:49:47 +0000 (12:49 +0000)]
Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: a31247bd8d

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280

8 years agoMerge "Changes for upgrade to OkHttp 2.7.5"
Tobias Thierer [Thu, 30 Jun 2016 12:35:03 +0000 (12:35 +0000)]
Merge "Changes for upgrade to OkHttp 2.7.5"

8 years agoChanges for upgrade to OkHttp 2.7.5
Tobias Thierer [Wed, 1 Jun 2016 19:51:45 +0000 (20:51 +0100)]
Changes for upgrade to OkHttp 2.7.5

 - Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
 - Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
   brings us closer to 3+

Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b

8 years agoPurr.
Dan Sandler [Tue, 28 Jun 2016 07:07:35 +0000 (07:07 +0000)]
Purr.
am: 610f6ede25

Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5

8 years agoOne final tweak to the platlogo.
Dan Sandler [Tue, 28 Jun 2016 07:07:31 +0000 (07:07 +0000)]
One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae

8 years agoFix SuperNotCalledException.
Dan Sandler [Tue, 28 Jun 2016 07:07:28 +0000 (07:07 +0000)]
Fix SuperNotCalledException.
am: 04f8cc2bb3

Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362

8 years agoPurr.
Dan Sandler [Tue, 28 Jun 2016 05:25:08 +0000 (01:25 -0400)]
Purr.

Bug: 27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432

8 years agoOne final tweak to the platlogo.
Dan Sandler [Tue, 28 Jun 2016 02:02:12 +0000 (22:02 -0400)]
One final tweak to the platlogo.

Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f

8 years agoFix SuperNotCalledException.
Dan Sandler [Tue, 28 Jun 2016 01:33:27 +0000 (21:33 -0400)]
Fix SuperNotCalledException.

Q. Dan, how did you make such a basic newbie mistake?
A. new phone who dis

Bug: 29779845
Change-Id: Iecba53effcf6252df228afd2cc80df43b2afaa59

8 years agoMerge \"Mark app pending intents in notification extras\" into nyc-dev
Svet Ganov [Tue, 28 Jun 2016 00:46:58 +0000 (00:46 +0000)]
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447

8 years agoMerge "Mark app pending intents in notification extras" into nyc-dev
Svetoslav Ganov [Tue, 28 Jun 2016 00:42:23 +0000 (00:42 +0000)]
Merge "Mark app pending intents in notification extras" into nyc-dev

8 years agoMark app pending intents in notification extras
Svet Ganov [Fri, 24 Jun 2016 02:55:24 +0000 (19:55 -0700)]
Mark app pending intents in notification extras

We need to make every peniding intent that went in the notification
system to allow special handling of such intents when fired by a
notification listener. If a pending intent from a notification
is sent from a notification listener, we white-list the source app
to run in data saver mode for a short period of time. The problem is
that actions and the notificaion can have extras which bundles may
contain pending intents but the system cannot look into the bundles
as they may contain custom parcelable objects. To address this we
keep a list of all pending intents in the notification allowing
the system to access them without touching the bundle. Currently
the pending intents are written to the parcel twice, once in the
bundle and once as the explicit list. We can come up with a scheme
to optimize this but since pending itents are just a binder pointer
it is not worth the excecise.

bug:29480440

Change-Id: I7328a47017ca226117adf7054900836619f5679b

8 years agoMerge \"Fix bug where process whitelist manager state would not be correct.\" into...
Dianne Hackborn [Mon, 27 Jun 2016 23:57:05 +0000 (23:57 +0000)]
Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am: a39d380651

Change-Id: I78f5a67a6b08f1275c66b7543e91b2bd016d621e

8 years agoMerge "Fix bug where process whitelist manager state would not be correct." into...
Dianne Hackborn [Mon, 27 Jun 2016 23:52:00 +0000 (23:52 +0000)]
Merge "Fix bug where process whitelist manager state would not be correct." into nyc-dev

8 years agoMerge \"Add extra waiting when switching users\" into nyc-dev
Pavlin Radoslavov [Mon, 27 Jun 2016 23:46:30 +0000 (23:46 +0000)]
Merge \"Add extra waiting when switching users\" into nyc-dev
am: 4d6be6b308

Change-Id: I3c54d6666d8327a0915d839ec02715961e62565a

8 years agoMerge "Add extra waiting when switching users" into nyc-dev
Andre Eisenbach [Mon, 27 Jun 2016 23:42:15 +0000 (23:42 +0000)]
Merge "Add extra waiting when switching users" into nyc-dev

8 years agoMerge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
Christopher Tate [Mon, 27 Jun 2016 23:24:03 +0000 (23:24 +0000)]
Merge \"Fix #29737133 : content-trigger jobs not running properly\" into nyc-dev
am: f480698298

Change-Id: I56aa1a6ecb2409b905de4a8419e1b76523120efc

8 years agoMerge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev
Chris Tate [Mon, 27 Jun 2016 23:18:30 +0000 (23:18 +0000)]
Merge "Fix #29737133 : content-trigger jobs not running properly" into nyc-dev

8 years agoFix #29737133 : content-trigger jobs not running properly
Christopher Tate [Mon, 27 Jun 2016 23:12:41 +0000 (16:12 -0700)]
Fix #29737133 : content-trigger jobs not running properly

When removing the ContentObserver wrapper from our internal
bookkeeping we were using the wrong key.  That led to future
re-registrations thinking they were reusing a currently-
registered observers, but instead never getting onChange()
notifications.

Change-Id: Id3111db057ae63194049d7d48d45b75be6bb0000

8 years agoAdd extra waiting when switching users
Pavlin Radoslavov [Mon, 27 Jun 2016 22:25:18 +0000 (15:25 -0700)]
Add extra waiting when switching users

If disabling Bluetooth times out, wait for an additional amount of time
to ensure the process is shut down completely before attempting to restart.

Bug: 29738770
Change-Id: I43dec35a1e03d12cb07863babea97d55baa32528

8 years agoFix bug where process whitelist manager state would not be correct.
Dianne Hackborn [Mon, 27 Jun 2016 22:07:18 +0000 (15:07 -0700)]
Fix bug where process whitelist manager state would not be correct.

We can't update this in updateOomAdjLocked(), because we very
deliberately only iterate through services in there as needed.
The correct thing to do is update the process as services/connections
are associated with it, so do that.

Now basically all of the logic for tracking the state is in
ActiveServices, as we bind and unbind services and add and removing
them from process records.  It's a little messy because we don't
have a central place for removing them from process records, which
should be cleaned up in the future.

Part of fixes for issue #29480440

Change-Id: Iac96f002a5b4e3b0277df244ff7b90f59a6e8440

8 years agoMerge \"Add missing roundOut for layer damage\" into nyc-dev
John Reck [Mon, 27 Jun 2016 22:28:39 +0000 (22:28 +0000)]
Merge \"Add missing roundOut for layer damage\" into nyc-dev
am: 48cde353eb

Change-Id: If4ca933e218fc33fa78dc063b687e03793635e6c

8 years agoMerge "Add missing roundOut for layer damage" into nyc-dev
John Reck [Mon, 27 Jun 2016 22:22:40 +0000 (22:22 +0000)]
Merge "Add missing roundOut for layer damage" into nyc-dev

8 years agoAdd missing roundOut for layer damage
John Reck [Mon, 27 Jun 2016 22:13:54 +0000 (15:13 -0700)]
Add missing roundOut for layer damage

fixes: 29771171

This is a regression from HWUI_NEW_OPS, a roundOut
was missing in the new path that was in the old one

Change-Id: Ibf223d550bb5525781864dd9b7f7cd6d73adb98b

8 years agoRound unclipped saveLayers
Chris Craik [Mon, 27 Jun 2016 21:45:04 +0000 (21:45 +0000)]
Round unclipped saveLayers
am: 45e83338e5

Change-Id: I3ecb7fdd2097779cf7f596c0e6a3f7914902ca39

8 years agoRound unclipped saveLayers
Chris Craik [Fri, 24 Jun 2016 20:53:37 +0000 (13:53 -0700)]
Round unclipped saveLayers

fixes: 29456451

Change-Id: I2be8b47c46936e75071ad0819a718f72b96cbd2b
(cherry picked from commit d5a90114128f4d3d528f1a0e93651496c968f940)

8 years agoMerge \"Resume only activities in focused stack\" into nyc-dev
Andrii Kulian [Mon, 27 Jun 2016 21:02:56 +0000 (21:02 +0000)]
Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9

Change-Id: I05dfd276d13b97b06737fecd22b238e791c9bc2b

8 years agoMerge \"Fix smooth panel deceleration\" into nyc-dev
Jorim Jaggi [Mon, 27 Jun 2016 20:54:26 +0000 (20:54 +0000)]
Merge \"Fix smooth panel deceleration\" into nyc-dev
am: e858432241

Change-Id: I4d66bd10517e05b2b9e930ad4860b371df0bc724

8 years agoMerge "Resume only activities in focused stack" into nyc-dev
Andrii Kulian [Mon, 27 Jun 2016 20:50:01 +0000 (20:50 +0000)]
Merge "Resume only activities in focused stack" into nyc-dev

8 years agoMerge "Fix smooth panel deceleration" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 20:44:55 +0000 (20:44 +0000)]
Merge "Fix smooth panel deceleration" into nyc-dev

8 years agoMerge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
Dan Albert [Mon, 27 Jun 2016 20:22:05 +0000 (20:22 +0000)]
Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev
am: 95fbc2de1b

Change-Id: Ia390c00f6884b73c625fffa3aabde4b53e4ebe90

8 years agoMerge "Fix mistranslation from the NDK changelog." into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 20:13:52 +0000 (20:13 +0000)]
Merge "Fix mistranslation from the NDK changelog." into nyc-dev

8 years agoRemove reference to obsolete installation step.
Dan Albert [Mon, 27 Jun 2016 20:02:34 +0000 (20:02 +0000)]
Remove reference to obsolete installation step.
am: 17d0ccb1a9

Change-Id: I8d4dc8aff65e01660f504f49815eecd2f20d2eae

8 years agoFix smooth panel deceleration
Jorim Jaggi [Mon, 27 Jun 2016 18:50:58 +0000 (11:50 -0700)]
Fix smooth panel deceleration

State of dismiss view was wrong when the panel was closed, thus, we didn't
apply our logic for smooth panel deceleration anymore.

Bug: 29579394
Change-Id: I79718517e776adad092457aba6db18219998fde1

8 years agoFix mistranslation from the NDK changelog.
Dan Albert [Mon, 27 Jun 2016 18:19:11 +0000 (11:19 -0700)]
Fix mistranslation from the NDK changelog.

Gingerbread begins at API level 9, not 10.

Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Ie65e543c06bed925f33e2cac92a27d6b83934a88

8 years agoMerge \"Add redirect for new Run/Debug Config doc b/29615014\" into nyc-dev
Cheryl Potter [Mon, 27 Jun 2016 18:16:59 +0000 (18:16 +0000)]
Merge \"Add redirect for new Run/Debug Config doc b/29615014\" into nyc-dev
am: 5836c9e658

Change-Id: I2cf78a594d415470b2f6512f7583e735f3488042

8 years agoRemove reference to obsolete installation step.
Dan Albert [Mon, 27 Jun 2016 17:52:24 +0000 (10:52 -0700)]
Remove reference to obsolete installation step.

Bug: https://github.com/android-ndk/ndk/issues/136
Change-Id: Idd08b009fefd69053675545bf94fda2147e01318

8 years agoMerge "Add redirect for new Run/Debug Config doc b/29615014" into nyc-dev
Cheryl Potter [Mon, 27 Jun 2016 18:02:53 +0000 (18:02 +0000)]
Merge "Add redirect for new Run/Debug Config doc b/29615014" into nyc-dev

8 years agoResume only activities in focused stack
Andrii Kulian [Mon, 27 Jun 2016 17:53:53 +0000 (10:53 -0700)]
Resume only activities in focused stack

While performing ensureActivitiesVisibleLocked we should only
resume activity in focused stack. Otherwise we can get several
resumed activities at the same time.

Bug: 29619461
Change-Id: Id65fe1a29841ee3166694bfb6a8236151b9fc7ec

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Mon, 27 Jun 2016 17:47:58 +0000 (17:47 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: cc67847367  -s ours

Change-Id: If4759dfe86ce2e9dd89eea01fcb71082a9585327

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 17:34:24 +0000 (17:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge \"Most cats would prefer chicken.\" into nyc-dev
Dan Sandler [Mon, 27 Jun 2016 17:16:46 +0000 (17:16 +0000)]
Merge \"Most cats would prefer chicken.\" into nyc-dev
am: d9069f8c9e

Change-Id: If486049672682e842267209469524611587d0b55

8 years agoMerge \"Add missing null checks\" into nyc-dev
John Reck [Mon, 27 Jun 2016 17:06:22 +0000 (17:06 +0000)]
Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Ib081c05d197b01ec3a9039941dd1265bf0b9b92c

8 years agoMerge "Most cats would prefer chicken." into nyc-dev
Daniel Sandler [Mon, 27 Jun 2016 16:56:29 +0000 (16:56 +0000)]
Merge "Most cats would prefer chicken." into nyc-dev

8 years agoMerge "Add missing null checks" into nyc-dev
John Reck [Mon, 27 Jun 2016 16:55:28 +0000 (16:55 +0000)]
Merge "Add missing null checks" into nyc-dev

8 years agoMost cats would prefer chicken.
Dan Sandler [Mon, 27 Jun 2016 15:51:14 +0000 (11:51 -0400)]
Most cats would prefer chicken.

Bug: 27376882
Change-Id: I2c6d04c2515fd23e44120a3f9ffd6b1668d521ff

8 years agoAdd redirect for new Run/Debug Config doc
Cheryl Potter [Mon, 27 Jun 2016 16:23:14 +0000 (09:23 -0700)]
Add redirect for new Run/Debug Config doc
b/29615014

Change-Id: Iff3d896d5f3788d0d20be0bfb6f305a77e094721

8 years agoMerge \"media: document format keys for MediaMuxer\" into nyc-dev
Lajos Molnar [Mon, 27 Jun 2016 16:16:41 +0000 (16:16 +0000)]
Merge \"media: document format keys for MediaMuxer\" into nyc-dev
am: 5059e65fec

Change-Id: I69c5b31fda557ea8d9ca0540f3878f566ada9b56

8 years agoMerge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
Lajos Molnar [Mon, 27 Jun 2016 16:16:37 +0000 (16:16 +0000)]
Merge \"media: document output image crop and layout for MediaCodec\" into nyc-dev
am: 939484b8ab

Change-Id: Iee0b8c9d07ac7847248e18f23fc26c5d8939f5bb

8 years agoMerge "media: document format keys for MediaMuxer" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 16:10:38 +0000 (16:10 +0000)]
Merge "media: document format keys for MediaMuxer" into nyc-dev

8 years agoMerge "media: document output image crop and layout for MediaCodec" into nyc-dev
TreeHugger Robot [Mon, 27 Jun 2016 16:09:50 +0000 (16:09 +0000)]
Merge "media: document output image crop and layout for MediaCodec" into nyc-dev

8 years agoAdd missing null checks
John Reck [Mon, 27 Jun 2016 14:56:37 +0000 (07:56 -0700)]
Add missing null checks

Bug: 29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 27 Jun 2016 09:31:14 +0000 (02:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: I284d2545fccfcb6c0d5dbab92090a6dd6d749b64
Auto-generated-cl: translation import

8 years agoMerge \"Update finding success page to feature playbook.\" into nyc-dev
Dirk Dougherty [Mon, 27 Jun 2016 02:54:25 +0000 (02:54 +0000)]
Merge \"Update finding success page to feature playbook.\" into nyc-dev
am: 61ae65f260

Change-Id: Ic6676c6a289dd8a4c4739073bd37050b655dfa1b

8 years agoMerge "Update finding success page to feature playbook." into nyc-dev
Dirk Dougherty [Mon, 27 Jun 2016 02:49:25 +0000 (02:49 +0000)]
Merge "Update finding success page to feature playbook." into nyc-dev

8 years agoCats are not, technically, tasty treats.
Dan Sandler [Sun, 26 Jun 2016 22:56:01 +0000 (22:56 +0000)]
Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I04dd4cf9573e88635e814d75162b742fe19b316d

8 years agoCats are not, technically, tasty treats.
Dan Sandler [Wed, 22 Jun 2016 04:05:11 +0000 (00:05 -0400)]
Cats are not, technically, tasty treats.

Bug: 27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>

8 years agoUpdate finding success page to feature playbook.
Dirk Dougherty [Fri, 24 Jun 2016 19:08:00 +0000 (12:08 -0700)]
Update finding success page to feature playbook.

Bug: 29207942
Change-Id: Ia8be8fa45bf9e37bb31627bdba042c7b3cfbe8c0

8 years agomedia: document output image crop and layout for MediaCodec
Lajos Molnar [Thu, 23 Jun 2016 23:34:48 +0000 (16:34 -0700)]
media: document output image crop and layout for MediaCodec

These use hidden, now deprecated MediaFormat keys.

Bug: 14127601
Change-Id: Ib51e4ef41204c9be34ad571300fcb7860feb504e

8 years agomedia: document format keys for MediaMuxer
Lajos Molnar [Fri, 24 Jun 2016 00:51:15 +0000 (17:51 -0700)]
media: document format keys for MediaMuxer

Bug: 19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738

8 years agoMerge \"Update DisplayMetrics when resizing\" into nyc-dev
Adam Lesinski [Fri, 24 Jun 2016 23:42:34 +0000 (23:42 +0000)]
Merge \"Update DisplayMetrics when resizing\" into nyc-dev
am: 34ccbe035a

Change-Id: I1b0b6711a3ad8c9fd29bbb967d59d59326fa7d25

8 years agoMerge "Update DisplayMetrics when resizing" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 23:35:12 +0000 (23:35 +0000)]
Merge "Update DisplayMetrics when resizing" into nyc-dev

8 years agoMerge \"Fix layout issue after insets changed\" into nyc-dev
Adam Powell [Fri, 24 Jun 2016 23:28:37 +0000 (23:28 +0000)]
Merge \"Fix layout issue after insets changed\" into nyc-dev
am: 119f1715b3

Change-Id: I3dc13e068c258a74acee79e6ab6a75b569c891e8

8 years agoMerge "Fix layout issue after insets changed" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 23:21:28 +0000 (23:21 +0000)]
Merge "Fix layout issue after insets changed" into nyc-dev

8 years agoMerge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
Robert Carr [Fri, 24 Jun 2016 22:50:45 +0000 (22:50 +0000)]
Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev
am: 8afc1f70f0

Change-Id: Ifcc58b9c6a4bdaf3df0dc49ac963bdc7e32aa409

8 years agoMerge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 22:43:30 +0000 (22:43 +0000)]
Merge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev

8 years agoMerge \"Update documentation for View.startDragAndDrop\" into nyc-dev
Yorke Lee [Fri, 24 Jun 2016 22:18:22 +0000 (22:18 +0000)]
Merge \"Update documentation for View.startDragAndDrop\" into nyc-dev
am: c63710ea48

Change-Id: I47ee9fa89edc5495616393a1c352677c8b990030

8 years agoUpdate DisplayMetrics when resizing
Adam Lesinski [Fri, 24 Jun 2016 19:29:16 +0000 (12:29 -0700)]
Update DisplayMetrics when resizing

Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.

Bug:29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
(cherry picked from commit 8e8d23214a71d8813ebd3676b192924c530cb913)