git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Oren Blasberg [Tue, 28 Jun 2016 21:19:30 +0000 (21:19 +0000)]

Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am: 29ea814354

Change-Id: I722e88756c576acca7419d53738d5883bf864260

commit | commitdiff | tree

Oren Blasberg [Tue, 28 Jun 2016 21:12:26 +0000 (21:12 +0000)]

Merge "Fix popup context menu appearing brokenly." into nyc-dev

commit | commitdiff | tree

Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]

Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am: c1374208e3

Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5

commit | commitdiff | tree

TreeHugger Robot [Tue, 28 Jun 2016 20:45:37 +0000 (20:45 +0000)]

Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev

commit | commitdiff | tree

Oren Blasberg [Tue, 28 Jun 2016 18:07:42 +0000 (11:07 -0700)]

Fix popup context menu appearing brokenly.

Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.

Bug: 29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972

commit | commitdiff | tree

Felipe Leme [Tue, 28 Jun 2016 19:22:34 +0000 (19:22 +0000)]

Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev
am: 8d78c33c9b

Change-Id: Ie86c30d925119f4ebfdb420ff0093d508e8274cb

commit | commitdiff | tree

Todd Kennedy [Tue, 28 Jun 2016 19:16:35 +0000 (19:16 +0000)]

Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0

commit | commitdiff | tree

TreeHugger Robot [Tue, 28 Jun 2016 19:15:33 +0000 (19:15 +0000)]

Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 28 Jun 2016 19:12:48 +0000 (19:12 +0000)]

Merge "Default minSdkVersion to '1'" into nyc-dev

commit | commitdiff | tree

Felipe Leme [Tue, 28 Jun 2016 18:29:54 +0000 (11:29 -0700)]

Remove redundant setPendingIntentWhitelistDuration() calls.

Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.

BUG: 29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a

commit | commitdiff | tree

Felipe Leme [Tue, 28 Jun 2016 17:38:59 +0000 (10:38 -0700)]

Fixed whitelistManager set on unbindServiceLocked()

It must call updateWhitelistManagerLocked() because the app might have
other services with the whitelistManager set, in which case the process
record should not have whitelistManager reset.

Fixes: 29480440

Change-Id: I268278c646aaa89a352f02178b294c02c3c11d35

commit | commitdiff | tree

Todd Kennedy [Tue, 28 Jun 2016 17:31:05 +0000 (10:31 -0700)]

Default minSdkVersion to '1'

Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 17:30:28 +0000 (17:30 +0000)]

Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 17:23:54 +0000 (17:23 +0000)]

Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev

commit | commitdiff | tree

Daniel Yu [Tue, 28 Jun 2016 16:28:34 +0000 (16:28 +0000)]

Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a

commit | commitdiff | tree

Dan Yu [Tue, 28 Jun 2016 16:21:56 +0000 (16:21 +0000)]

Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev

commit | commitdiff | tree

Shreyas Basarge [Tue, 28 Jun 2016 15:42:59 +0000 (15:42 +0000)]

Merge \"SyncOperation float cast fix\" into nyc-dev
am: 5f72b129c4

Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2

commit | commitdiff | tree

Shreyas Basarge [Tue, 28 Jun 2016 15:38:05 +0000 (15:38 +0000)]

Merge "SyncOperation float cast fix" into nyc-dev

commit | commitdiff | tree

Dan Sandler [Tue, 28 Jun 2016 07:07:35 +0000 (07:07 +0000)]

Purr.
am: 610f6ede25

Change-Id: I0dc3c9da110b8a92ecde6dbc28eb572a148ad6f5

commit | commitdiff | tree

Dan Sandler [Tue, 28 Jun 2016 07:07:31 +0000 (07:07 +0000)]

One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae

commit | commitdiff | tree

Dan Sandler [Tue, 28 Jun 2016 07:07:28 +0000 (07:07 +0000)]

Fix SuperNotCalledException.
am: 04f8cc2bb3

Change-Id: Ic981a15b565092ea13a618c7ac0ed9d000854362

commit | commitdiff | tree

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

Purr.

Bug: 27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432

commit | commitdiff | tree

Dan Sandler [Tue, 28 Jun 2016 02:02:12 +0000 (22:02 -0400)]

One final tweak to the platlogo.

Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Svetoslav Ganov [Tue, 28 Jun 2016 00:42:23 +0000 (00:42 +0000)]

Merge "Mark app pending intents in notification extras" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Allen Hair [Tue, 28 Jun 2016 00:01:50 +0000 (17:01 -0700)]

Add a flag to enable instrumentation of the framework classes.

Bug: 29777843
Change-Id: I0f3639ad1303a9b2cc612f99cde427dedff4874f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andre Eisenbach [Mon, 27 Jun 2016 23:42:15 +0000 (23:42 +0000)]

Merge "Add extra waiting when switching users" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Reck [Mon, 27 Jun 2016 22:22:40 +0000 (22:22 +0000)]

Merge "Add missing roundOut for layer damage" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Craik [Mon, 27 Jun 2016 21:45:04 +0000 (21:45 +0000)]

Round unclipped saveLayers
am: 45e83338e5

Change-Id: I3ecb7fdd2097779cf7f596c0e6a3f7914902ca39

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andrii Kulian [Mon, 27 Jun 2016 20:50:01 +0000 (20:50 +0000)]

Merge "Resume only activities in focused stack" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 27 Jun 2016 20:44:55 +0000 (20:44 +0000)]

Merge "Fix smooth panel deceleration" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 27 Jun 2016 20:13:52 +0000 (20:13 +0000)]

Merge "Fix mistranslation from the NDK changelog." into nyc-dev

commit | commitdiff | tree

Dan Albert [Mon, 27 Jun 2016 20:02:34 +0000 (20:02 +0000)]

Remove reference to obsolete installation step.
am: 17d0ccb1a9

Change-Id: I8d4dc8aff65e01660f504f49815eecd2f20d2eae

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 27 Jun 2016 17:34:24 +0000 (17:34 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Daniel Sandler [Mon, 27 Jun 2016 16:56:29 +0000 (16:56 +0000)]

Merge "Most cats would prefer chicken." into nyc-dev

commit | commitdiff | tree

John Reck [Mon, 27 Jun 2016 16:55:28 +0000 (16:55 +0000)]

Merge "Add missing null checks" into nyc-dev

commit | commitdiff | tree

Dan Sandler [Mon, 27 Jun 2016 15:51:14 +0000 (11:51 -0400)]

Most cats would prefer chicken.

Bug: 27376882
Change-Id: I2c6d04c2515fd23e44120a3f9ffd6b1668d521ff

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Mon, 27 Jun 2016 16:10:38 +0000 (16:10 +0000)]

Merge "media: document format keys for MediaMuxer" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

John Reck [Mon, 27 Jun 2016 14:56:37 +0000 (07:56 -0700)]

Add missing null checks

Bug: 29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8

commit | commitdiff | tree

Shreyas Basarge [Fri, 24 Jun 2016 17:45:51 +0000 (18:45 +0100)]

SyncOperation float cast fix

Fix casting of Float into Double in SyncOperation.

Bug: 29510536
Change-Id: I553e8988e4bc09c3624e42f6f108f723007d32c4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dirk Dougherty [Mon, 27 Jun 2016 02:49:25 +0000 (02:49 +0000)]

Merge "Update finding success page to feature playbook." into nyc-dev

commit | commitdiff | tree

Dan Sandler [Sun, 26 Jun 2016 22:56:01 +0000 (22:56 +0000)]

Cats are not, technically, tasty treats.
am: 27a9fcc618

Change-Id: I04dd4cf9573e88635e814d75162b742fe19b316d

commit | commitdiff | tree

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>

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Fri, 24 Jun 2016 00:51:15 +0000 (17:51 -0700)]

media: document format keys for MediaMuxer

Bug: 19461810
Change-Id: Iee4396aa6f00b3f580c02fa99f0b9291700f5738

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 24 Jun 2016 23:35:12 +0000 (23:35 +0000)]

Merge "Update DisplayMetrics when resizing" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 24 Jun 2016 23:21:28 +0000 (23:21 +0000)]

Merge "Fix layout issue after insets changed" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 24 Jun 2016 22:43:30 +0000 (22:43 +0000)]

Merge "PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL." into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Yorke Lee [Fri, 24 Jun 2016 22:10:46 +0000 (22:10 +0000)]

Merge "Update documentation for View.startDragAndDrop" into nyc-dev

commit | commitdiff | tree

Adam Powell [Fri, 24 Jun 2016 21:42:30 +0000 (14:42 -0700)]

Fix layout issue after insets changed

Fix a regression where a change in insets would forceLayout on the
view hierarchy but not run the measure/layout as a result. This would
cause layout requests to become stalled until a window-level relayout
event.

Bug 29634368

Change-Id: Ia3f32f5891c8b32c06c13f95ebd0572233572b04

commit | commitdiff | tree

Robert Carr [Fri, 24 Jun 2016 20:58:16 +0000 (13:58 -0700)]

PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.

When we want the WindowManager to clip our requested width/height
to the display frame, we need to pass DISPLAY_CLIP_VERTICAL/HORIZONTAL.
It seems this behavior was unintentionally applied without this flag
in previous releases.

Bug: 29602363
Change-Id: Ib98060e36efde0dbaabb59a758da5374035dbb62

commit | commitdiff | tree

Min Yun [Fri, 24 Jun 2016 20:10:14 +0000 (20:10 +0000)]

Reapply more strings for \"more settings\"
am: de383c75eb

Change-Id: Ib63f9af9c2a25934927bc9b51de8fcc94a753f05

commit | commitdiff | tree

Min Yun [Fri, 24 Jun 2016 18:05:03 +0000 (11:05 -0700)]

Reapply more strings for "more settings"

Fixes: 29620816

Change-Id: Iabfcb3b762e1d7d105d2b4c417fc0902d7e7ca16

commit | commitdiff | tree

Daniel Yu [Fri, 24 Jun 2016 18:13:40 +0000 (11:13 -0700)]

resolve merge conflicts of ac5b340 to nyc-dev

Change-Id: I3a7af34cdf7656896a3895c61c8c58d6f8f094a0

commit | commitdiff | tree

Bill Yi [Fri, 24 Jun 2016 17:23:28 +0000 (17:23 +0000)]

Import translations. DO NOT MERGE
am: 34f5924ca6 -s ours

Change-Id: I7b2fb02e671ba6c421f0443a98a1756f9b7f2a98

commit | commitdiff | tree

Yi Kong [Fri, 24 Jun 2016 17:04:42 +0000 (17:04 +0000)]

Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" am: f388075f8f
am: a153a22f80

Change-Id: Iaab8f3a6fc68ab42a4061cc68b3de92a4f859c25

commit | commitdiff | tree

Yi Kong [Fri, 24 Jun 2016 16:55:48 +0000 (16:55 +0000)]

Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\"
am: f388075f8f

Change-Id: I5f595620ecea5f4f05da90673414b7b130c7b848

commit | commitdiff | tree

Yi Kong [Fri, 24 Jun 2016 16:55:38 +0000 (16:55 +0000)]

Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc

commit | commitdiff | tree

Yi Kong [Fri, 24 Jun 2016 16:47:30 +0000 (16:47 +0000)]

Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master

commit | commitdiff | tree

Yi Kong [Fri, 24 Jun 2016 16:47:02 +0000 (16:47 +0000)]

Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259"

commit | commitdiff | tree

Daniel Yu [Fri, 24 Jun 2016 16:37:45 +0000 (16:37 +0000)]

Merge \"docs: Fixing MediaSession note in PIP preview docs\" into mnc-io-docs
am: daaf8e7f1c

Change-Id: I310823425b0706bdf4221e266a87e9c9aa66dd95

commit | commitdiff | tree

Dan Yu [Fri, 24 Jun 2016 16:26:11 +0000 (16:26 +0000)]

Merge "docs: Fixing MediaSession note in PIP preview docs" into mnc-io-docs