OSDN Git Service

android-x86/frameworks-base.git
9 years agoStart respecting View.DRAG_FLAG_GLOBAL flag.
Vladislav Kaznacheev [Wed, 18 Mar 2015 23:28:06 +0000 (16:28 -0700)]
Start respecting View.DRAG_FLAG_GLOBAL flag.

Respect flags passed to startDrag (they used to be ignored).
Allow global drag&drop for text views.

Bug: 19548858
Change-Id: I981cfd617ebc6f5f2d59ebded798c22dc4920d38

9 years agoMerge "Enable/disable hardware rendering on windows by application tag"
Alan Viverette [Wed, 18 Mar 2015 20:01:49 +0000 (20:01 +0000)]
Merge "Enable/disable hardware rendering on windows by application tag"

9 years agoEnable/disable hardware rendering on windows by application tag
Alan Viverette [Wed, 18 Mar 2015 19:43:08 +0000 (12:43 -0700)]
Enable/disable hardware rendering on windows by application tag

Previously, hardware rendering cannot be enabled or disabled
on windows created without a parent activity (e.g. by services)
by setting the <application> tag, "android:hardwareAccelerated"
in AndroidManifest.xml. It's enabled by default in Android L
from the commit, 5e1565ead6dbb7d5c414522591f61b16a23de1c3.
This patch provides a way of setting hardware rendering for
that case.

Change-Id: I08ce58a8644970a2a18407e83ad317a72a2dad10
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
9 years agoMerge "Remove unnecessary null check in FastScroller"
Alan Viverette [Wed, 18 Mar 2015 19:36:52 +0000 (19:36 +0000)]
Merge "Remove unnecessary null check in FastScroller"

9 years agoNew ContentInfoExtender for Notifications
Jose Lima [Tue, 24 Feb 2015 01:09:03 +0000 (17:09 -0800)]
New ContentInfoExtender for Notifications

Added a new Extender to add Content Info data to notification objects.

Change-Id: I29a84915ad0c0bb724c2fcdc53d9a4c4db95ba93

9 years agoMerge "Update package manager documentation."
John Spurlock [Wed, 18 Mar 2015 19:23:16 +0000 (19:23 +0000)]
Merge "Update package manager documentation."

9 years agoMerge "Add Email.ENTERPRISE_CONTENT_LOOKUP_URI"
Ricky Wai [Wed, 18 Mar 2015 18:43:51 +0000 (18:43 +0000)]
Merge "Add Email.ENTERPRISE_CONTENT_LOOKUP_URI"

9 years agoam a52b0988: resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp
Kenny Root [Wed, 18 Mar 2015 18:28:59 +0000 (18:28 +0000)]
am a52b0988: resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp

* commit 'a52b0988f27a0bfe88d38aee5133c25264913f68':
  Track change to Conscrypt

9 years agoresolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp
Kenny Root [Wed, 18 Mar 2015 18:20:30 +0000 (11:20 -0700)]
resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp

9 years agoam 61ecb53e: resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp
Kenny Root [Wed, 18 Mar 2015 17:34:36 +0000 (17:34 +0000)]
am 61ecb53e: resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp

* commit '61ecb53e73747b6400ba1cc2ffa2877c32a68fcd':
  Track change to Conscrypt

9 years agoresolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp
Kenny Root [Wed, 18 Mar 2015 17:26:11 +0000 (10:26 -0700)]
resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp

Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2

9 years agoRemove unnecessary null check in FastScroller
Alan Viverette [Wed, 18 Mar 2015 17:25:43 +0000 (10:25 -0700)]
Remove unnecessary null check in FastScroller

Bug: 19805564
Change-Id: I12e1a3cadf52038fb480e5694d12b6ec5e0e467b

9 years agoam 4ff668d4: Track change to Conscrypt
Kenny Root [Wed, 18 Mar 2015 16:54:33 +0000 (16:54 +0000)]
am 4ff668d4: Track change to Conscrypt

* commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa':
  Track change to Conscrypt

9 years agoam fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev
Kenny Root [Wed, 18 Mar 2015 16:54:29 +0000 (16:54 +0000)]
am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev

* commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2':
  Track change to Conscrypt

9 years agoUpdate package manager documentation.
John Spurlock [Wed, 18 Mar 2015 16:09:32 +0000 (12:09 -0400)]
Update package manager documentation.

Out lists are required to be non null.

Change-Id: I87b586a90f9f221bbea6f6f18135bfcdd65680c2

9 years agoam 3b419c0f: (-s ours) am c0ca0de7: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 18 Mar 2015 15:49:36 +0000 (15:49 +0000)]
am 3b419c0f: (-s ours) am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '3b419c0f5c870960b11c9fde81e9eb8ea8976aad':
  Import translations. DO NOT MERGE

9 years agoam c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 18 Mar 2015 15:43:02 +0000 (15:43 +0000)]
am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit 'c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Wed, 18 Mar 2015 15:37:10 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Mar 2015 15:36:22 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 15:00:13 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 14:54:46 +0000 (07:54 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Mar 2015 13:53:30 +0000 (13:53 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 13:49:50 +0000 (06:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Mar 2015 13:18:06 +0000 (13:18 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 13:11:15 +0000 (06:11 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 2e5651db: (-s ours) am 8d889a67: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 13:01:16 +0000 (13:01 +0000)]
am 2e5651db: (-s ours) am 8d889a67: (-s ours) Import translations. DO NOT MERGE

* commit '2e5651dbfd0dbea89657d381f48f0191d3b0558a':
  Import translations. DO NOT MERGE

9 years agoam 8d889a67: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:54:48 +0000 (12:54 +0000)]
am 8d889a67: (-s ours) Import translations. DO NOT MERGE

* commit '8d889a67d079200fac0530542f48dd1d2fdedc4e':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:47:44 +0000 (05:47 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "TIF: Add a missing comment for the return value of onSelectTrack()"
Jae Seo [Wed, 18 Mar 2015 01:20:05 +0000 (01:20 +0000)]
Merge "TIF: Add a missing comment for the return value of onSelectTrack()"

9 years agoTIF: Add a missing comment for the return value of onSelectTrack()
Jae Seo [Wed, 18 Mar 2015 00:18:07 +0000 (17:18 -0700)]
TIF: Add a missing comment for the return value of onSelectTrack()

Bug: 19630395
Change-Id: I2caa9ace23ee003e9662e363538a363ae9a0ced7

9 years agoMerge "Add single-arg TextView.setTextAppearance, deprecate two-arg method"
Alan Viverette [Wed, 18 Mar 2015 00:34:36 +0000 (00:34 +0000)]
Merge "Add single-arg TextView.setTextAppearance, deprecate two-arg method"

9 years agoMerge "Fix build."
Dianne Hackborn [Wed, 18 Mar 2015 00:25:24 +0000 (00:25 +0000)]
Merge "Fix build."

9 years agoFix build.
Dianne Hackborn [Wed, 18 Mar 2015 00:22:33 +0000 (17:22 -0700)]
Fix build.

Change-Id: I6797bb2b5c85961c3bcb3fa8950bae121232f592

9 years agoMerge "Fix missing printf argument."
Erik Kline [Wed, 18 Mar 2015 00:07:43 +0000 (00:07 +0000)]
Merge "Fix missing printf argument."

9 years agoAdd ability to get a screenshot for assist.
Dianne Hackborn [Tue, 17 Mar 2015 00:15:53 +0000 (17:15 -0700)]
Add ability to get a screenshot for assist.

New flag you pass in to startSession() to say you want it,
new callback on VoiceInteractionSession to receive it.

Change-Id: I61fdcfdee41a60d46036a2ef16681a9b4181115a

9 years agoMerge "Change resize logic: Use resizeTask and remove stack resize UI/logic"
Skuhne [Tue, 17 Mar 2015 23:35:34 +0000 (23:35 +0000)]
Merge "Change resize logic: Use resizeTask and remove stack resize UI/logic"

9 years agoChange resize logic: Use resizeTask and remove stack resize UI/logic
Skuhne [Tue, 17 Mar 2015 22:02:18 +0000 (15:02 -0700)]
Change resize logic: Use resizeTask and remove stack resize UI/logic

Change-Id: I5af8171a4ca55252c009cf80d180c5d024c0fa03

9 years agoMerge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""
Andy Hung [Tue, 17 Mar 2015 23:13:07 +0000 (23:13 +0000)]
Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""

9 years agoMerge "Revert "Revert "soundpool: reuse channel for same sample if available"""
Andy Hung [Tue, 17 Mar 2015 23:12:34 +0000 (23:12 +0000)]
Merge "Revert "Revert "soundpool: reuse channel for same sample if available"""

9 years agoFix missing printf argument.
Erik Kline [Tue, 17 Mar 2015 23:08:57 +0000 (08:08 +0900)]
Fix missing printf argument.

Change-Id: Ifd1eebfbcefa06570882da54a1c410eabf26bce7

9 years agoRevert "Revert "soundpool: update sample rate when reusing audiotrack""
Andy Hung [Tue, 17 Mar 2015 23:05:12 +0000 (23:05 +0000)]
Revert "Revert "soundpool: update sample rate when reusing audiotrack""

This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1.

Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d

9 years agoRevert "Revert "soundpool: reuse channel for same sample if available""
Andy Hung [Tue, 17 Mar 2015 23:02:00 +0000 (23:02 +0000)]
Revert "Revert "soundpool: reuse channel for same sample if available""

This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc.

Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3

9 years agoMerge "Add methods to indicate accessibility support."
Andrew Lee [Tue, 17 Mar 2015 22:56:05 +0000 (22:56 +0000)]
Merge "Add methods to indicate accessibility support."

9 years agoMerge "Fix AudioRecord read to be blocking"
Andy Hung [Tue, 17 Mar 2015 22:51:30 +0000 (22:51 +0000)]
Merge "Fix AudioRecord read to be blocking"

9 years agoTrack change to Conscrypt
Kenny Root [Wed, 26 Nov 2014 17:08:40 +0000 (09:08 -0800)]
Track change to Conscrypt

(cherry picked from commit 9d2d6b6b4b1b16221cbd857703cd6301c6bf873c)

Bug: 19798387
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413

9 years agoMerge "Track change to Conscrypt" into lmp-mr1-ub-dev
Kenny Root [Tue, 17 Mar 2015 22:21:52 +0000 (22:21 +0000)]
Merge "Track change to Conscrypt" into lmp-mr1-ub-dev

9 years agoMerge "Allow initializers to clear reset protection data during device setup."
Julia Reynolds [Tue, 17 Mar 2015 22:13:30 +0000 (22:13 +0000)]
Merge "Allow initializers to clear reset protection data during device setup."

9 years agoam 46277ba2: am 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"
Andreas Gampe [Tue, 17 Mar 2015 22:02:36 +0000 (22:02 +0000)]
am 46277ba2: am 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"

* commit '46277ba2c70e9fe0fc9772dcb84040aff1c322be':
  Frameworks/base: Make IDENTITY_MATRIX final

9 years agoam d6f25364: am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
Andreas Gampe [Tue, 17 Mar 2015 22:02:29 +0000 (22:02 +0000)]
am d6f25364: am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"

* commit 'd6f25364eed09d39b493488cd6adaa02e0d8a252':
  Frameworks/base: Fix format string in Geofence

9 years agoRevert "Persist settings on a normal priority thread."
Svetoslav Ganov [Fri, 13 Mar 2015 19:39:53 +0000 (19:39 +0000)]
Revert "Persist settings on a normal priority thread."

This reverts commit d289e64a2d7c8efba78b9066b647ee321eba701a.

Change-Id: Ic9455b538e0be8b9a4e4672f99b14978e70d2911

9 years agoam 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"
Andreas Gampe [Tue, 17 Mar 2015 21:43:01 +0000 (21:43 +0000)]
am 28e6aeca: Merge "Frameworks/base: Make IDENTITY_MATRIX final"

* commit '28e6aeca3aad075ef4fd7aab08cd1ad1ff9eb555':
  Frameworks/base: Make IDENTITY_MATRIX final

9 years agoam 9568772a: Merge "Frameworks/base: Fix format string in Geofence"
Andreas Gampe [Tue, 17 Mar 2015 21:42:55 +0000 (21:42 +0000)]
am 9568772a: Merge "Frameworks/base: Fix format string in Geofence"

* commit '9568772acbf5b36f2edb41f7c5b06d499329add0':
  Frameworks/base: Fix format string in Geofence

9 years agoMerge "Frameworks/base: Make IDENTITY_MATRIX final"
Andreas Gampe [Tue, 17 Mar 2015 21:33:08 +0000 (21:33 +0000)]
Merge "Frameworks/base: Make IDENTITY_MATRIX final"

9 years agoFrameworks/base: Make IDENTITY_MATRIX final
Andreas Gampe [Mon, 16 Mar 2015 01:55:33 +0000 (18:55 -0700)]
Frameworks/base: Make IDENTITY_MATRIX final

Bug: 19797138
Change-Id: I127f24b7060a0c4dab401ce8e3057d362c6d6b06

9 years agoMerge "Frameworks/base: Fix format string in Geofence"
Andreas Gampe [Tue, 17 Mar 2015 21:30:49 +0000 (21:30 +0000)]
Merge "Frameworks/base: Fix format string in Geofence"

9 years agoFrameworks/base: Fix format string in Geofence
Andreas Gampe [Sun, 15 Mar 2015 21:49:15 +0000 (14:49 -0700)]
Frameworks/base: Fix format string in Geofence

%p is not a valid conversion in format strings. It is also superfluous,
as it is already known that location is null.

Bug: 19797138
Change-Id: I5784e28b05b4ca9aac57e0fc9da4a7f01d9b3247

9 years agoTrack change to Conscrypt
Kenny Root [Fri, 31 Oct 2014 17:28:04 +0000 (10:28 -0700)]
Track change to Conscrypt

Change way in which an outside caller can get the preferred SSLContext.

(cherry picked from commit 8a970637208207955fb6a719bd82902384b3c743)

Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09

9 years agoMerge "Recents: Tapping on background returns to launcher"
James Cook [Tue, 17 Mar 2015 21:16:28 +0000 (21:16 +0000)]
Merge "Recents: Tapping on background returns to launcher"

9 years agoam 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
Andreas Gampe [Tue, 17 Mar 2015 21:12:25 +0000 (21:12 +0000)]
am 3814163b: am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"

* commit '3814163b6ddc35292f6b25f782ad7a858c703c24':
  Frameworks/base: Fix format string in Camera

9 years agoam aae42eb2: Merge "Frameworks/base: Fix format string in Camera"
Andreas Gampe [Tue, 17 Mar 2015 21:05:48 +0000 (21:05 +0000)]
am aae42eb2: Merge "Frameworks/base: Fix format string in Camera"

* commit 'aae42eb26176482b09f0846e6acf7efa844a0d23':
  Frameworks/base: Fix format string in Camera

9 years agoam e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug"
Andreas Gampe [Tue, 17 Mar 2015 20:56:02 +0000 (20:56 +0000)]
am e4bdf3c1: am be549f9b: Merge "Frameworks/base: Fix precedence bug"

* commit 'e4bdf3c1c9e7be06b68cc32f9a492d512bf87528':
  Frameworks/base: Fix precedence bug

9 years agoMerge "Frameworks/base: Fix format string in Camera"
Andreas Gampe [Tue, 17 Mar 2015 20:52:20 +0000 (20:52 +0000)]
Merge "Frameworks/base: Fix format string in Camera"

9 years agoFrameworks/base: Fix format string in Camera
Andreas Gampe [Sun, 15 Mar 2015 21:43:31 +0000 (14:43 -0700)]
Frameworks/base: Fix format string in Camera

One cannot print a boolean with %d. That will result in an exception.

Bug: 19797138
Change-Id: I86c42ea834cebebaecff8463637cc9de14d1fc88

9 years agoam be549f9b: Merge "Frameworks/base: Fix precedence bug"
Andreas Gampe [Tue, 17 Mar 2015 20:49:18 +0000 (20:49 +0000)]
am be549f9b: Merge "Frameworks/base: Fix precedence bug"

* commit 'be549f9b8e01f884a2cc2d668457c6b1c12ff4cc':
  Frameworks/base: Fix precedence bug

9 years agoam d0663e03: am 7bd2feda: Merge "Add animation to zeroing burn in protection." into...
Filip Gruszczynski [Tue, 17 Mar 2015 20:47:48 +0000 (20:47 +0000)]
am d0663e03: am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev

* commit 'd0663e03657704db8e9006a0a3aa919ed28c6d03':
  Add animation to zeroing burn in protection.

9 years agoam c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
Andreas Gampe [Tue, 17 Mar 2015 20:47:41 +0000 (20:47 +0000)]
am c8484abb: am 0ae488e1: Merge "Frameworks/base: Use || instead of |"

* commit 'c8484abbbde02171023f159491ca342186ae095c':
  Frameworks/base: Use || instead of |

9 years agoam 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Tue, 17 Mar 2015 20:47:33 +0000 (20:47 +0000)]
am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"

* commit '17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a':
  Frameworks/base: Fix trivial equals implementation

9 years agoam 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modula...
Filip Gruszczynski [Tue, 17 Mar 2015 20:44:58 +0000 (20:44 +0000)]
am 7bd2feda: Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev

* commit '7bd2feda9e146c90c8720d8aa213ebcd9c30430c':
  Add animation to zeroing burn in protection.

9 years agoam 0ae488e1: Merge "Frameworks/base: Use || instead of |"
Andreas Gampe [Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)]
am 0ae488e1: Merge "Frameworks/base: Use || instead of |"

* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |

9 years agoam 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Tue, 17 Mar 2015 20:40:58 +0000 (20:40 +0000)]
am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"

* commit '4d9076437c0270cd863493f505e734a3108e89ea':
  Frameworks/base: Fix trivial equals implementation

9 years agoMerge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev
Filip Gruszczynski [Tue, 17 Mar 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Add animation to zeroing burn in protection." into lmp-mr1-modular-dev

9 years agoMerge "Frameworks/base: Fix precedence bug"
Andreas Gampe [Tue, 17 Mar 2015 20:36:21 +0000 (20:36 +0000)]
Merge "Frameworks/base: Fix precedence bug"

9 years agoFrameworks/base: Fix precedence bug
Andreas Gampe [Sun, 15 Mar 2015 20:59:50 +0000 (13:59 -0700)]
Frameworks/base: Fix precedence bug

Explicit cast has higher precedence than shift.

Bug: 19797138
Change-Id: Ifcf569bf774fbf65ee50c078f736ad167bcc6b8c

9 years agoMerge "Frameworks/base: Use || instead of |"
Andreas Gampe [Tue, 17 Mar 2015 20:28:52 +0000 (20:28 +0000)]
Merge "Frameworks/base: Use || instead of |"

9 years agoFrameworks/base: Use || instead of |
Andreas Gampe [Mon, 16 Mar 2015 03:32:22 +0000 (20:32 -0700)]
Frameworks/base: Use || instead of |

Nothing wrong with | in this case, but || is canonical.

Bug: 19797138
Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f

9 years agoMerge "Frameworks/base: Fix trivial equals implementation"
Andreas Gampe [Tue, 17 Mar 2015 20:25:20 +0000 (20:25 +0000)]
Merge "Frameworks/base: Fix trivial equals implementation"

9 years agoFrameworks/base: Fix trivial equals implementation
Andreas Gampe [Sun, 15 Mar 2015 22:21:25 +0000 (15:21 -0700)]
Frameworks/base: Fix trivial equals implementation

The comparator's equal implementation doesn't satisfy the constraints
of an equals method, namely being reflexive. Use the standard Object
implementation instead.

Bug: 19797138
Change-Id: I74f888e99533e1945aab7ab10fe8ee3ded6388f4

9 years agoMerge "Recompute focus stack if cleared while starting an activity."
Wale Ogunwale [Tue, 17 Mar 2015 20:22:36 +0000 (20:22 +0000)]
Merge "Recompute focus stack if cleared while starting an activity."

9 years agoRecompute focus stack if cleared while starting an activity.
Wale Ogunwale [Tue, 17 Mar 2015 18:36:24 +0000 (11:36 -0700)]
Recompute focus stack if cleared while starting an activity.

When starting an activity with Intent.FLAG_ACTIVITY_CLEAR_TOP flag,
the activity is destoried which can also cause its task to be removed
from its current stack if the activity process record is null. We now
recompute the stack for the activity task when this occurs so we
don't NPE later on.

Bug: 19552874

Change-Id: I50f51ca6dc32d4642f78d59cae93b0774bc6cdb7

9 years agoam 88dde1db: am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode document...
Brian Carlstrom [Tue, 17 Mar 2015 19:51:28 +0000 (19:51 +0000)]
am 88dde1db: am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '88dde1db446c414bee7fb56e292be6b0ce6ac268':
  Update vmSafeMode documentation

9 years agoam d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into...
Brian Carlstrom [Tue, 17 Mar 2015 19:44:55 +0000 (19:44 +0000)]
am d8507e3a: am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit 'd8507e3aa4c8b05f753cd9541014c391891c1f75':
  Update vmSafeMode documentation

9 years agoam 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:36:19 +0000 (19:36 +0000)]
am 83419118: am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '83419118e3c72311ef6b900457d1b03fd5c77883':
  Update vmSafeMode documentation

9 years agoam 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:29:20 +0000 (19:29 +0000)]
am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev

* commit '97f3cd0a8280b2cf08069cc1e2d89d8bb227633f':
  Update vmSafeMode documentation

9 years agoMerge "QS: 'Cast screen' -> 'Cast'."
John Spurlock [Tue, 17 Mar 2015 19:24:23 +0000 (19:24 +0000)]
Merge "QS: 'Cast screen' -> 'Cast'."

9 years agoMerge "Update vmSafeMode documentation" into lmp-mr1-dev
Brian Carlstrom [Tue, 17 Mar 2015 19:22:45 +0000 (19:22 +0000)]
Merge "Update vmSafeMode documentation" into lmp-mr1-dev

9 years agoMerge "Audio: Flag volume adjustments from hardware keys."
John Spurlock [Tue, 17 Mar 2015 19:19:00 +0000 (19:19 +0000)]
Merge "Audio: Flag volume adjustments from hardware keys."

9 years agoMerge "Delete the ActionModeWrapper now that it is not needed anymore."
Clara Bayarri [Tue, 17 Mar 2015 19:12:26 +0000 (19:12 +0000)]
Merge "Delete the ActionModeWrapper now that it is not needed anymore."

9 years agoMerge "camera2: Release surface in ImageReader#close and fix legacy cleanup"
Ruben Brunk [Tue, 17 Mar 2015 19:11:31 +0000 (19:11 +0000)]
Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup"

9 years agoam 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for device...
Filip Gruszczynski [Tue, 17 Mar 2015 19:06:58 +0000 (19:06 +0000)]
am 81c47fc2: am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

* commit '81c47fc23a0a15dddf37d96d28305e8b5e5ca2da':
  Option for going home when going to sleep for devices without physical button.

9 years agoMerge "Convert some log points to in AMS to use ActivityManagerDebugConfig class."
Wale Ogunwale [Tue, 17 Mar 2015 19:02:59 +0000 (19:02 +0000)]
Merge "Convert some log points to in AMS to use ActivityManagerDebugConfig class."

9 years agoConvert some log points to in AMS to use ActivityManagerDebugConfig class.
Wale Ogunwale [Mon, 16 Mar 2015 16:55:45 +0000 (09:55 -0700)]
Convert some log points to in AMS to use ActivityManagerDebugConfig class.

Change-Id: I02154b0e1c2c64af840848fd6def054342922efa

9 years agoam 86318d76: Merge "Option for going home when going to sleep for devices without...
Filip Gruszczynski [Tue, 17 Mar 2015 18:35:17 +0000 (18:35 +0000)]
am 86318d76: Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

* commit '86318d768a2c5043e1261e9daacf1497d1e4a732':
  Option for going home when going to sleep for devices without physical button.

9 years agoAdd animation to zeroing burn in protection.
Filip Gruszczynski [Mon, 16 Mar 2015 21:47:32 +0000 (14:47 -0700)]
Add animation to zeroing burn in protection.

Also don't shift immediately after starting ambient mode, but wait until
the first update.

Bug: 19521822
Change-Id: Id0b267d0f30e4533195dcfadbed726db0866e4db

9 years agoMerge "Option for going home when going to sleep for devices without physical button...
Filip Gruszczynski [Tue, 17 Mar 2015 18:29:29 +0000 (18:29 +0000)]
Merge "Option for going home when going to sleep for devices without physical button." into lmp-mr1-modular-dev

9 years agoQS: 'Cast screen' -> 'Cast'.
John Spurlock [Tue, 17 Mar 2015 18:23:00 +0000 (14:23 -0400)]
QS: 'Cast screen' -> 'Cast'.

Bug: 19773357
Change-Id: I967c972986af4eb97374d7cde1d3b19fb28986ff

9 years agoAudio: Flag volume adjustments from hardware keys.
John Spurlock [Tue, 17 Mar 2015 18:11:57 +0000 (14:11 -0400)]
Audio: Flag volume adjustments from hardware keys.

Bug: 19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc

9 years agoMerge "Notify newly registered audio focus listener of current focus owner"
Jean-Michel Trivi [Tue, 17 Mar 2015 18:05:03 +0000 (18:05 +0000)]
Merge "Notify newly registered audio focus listener of current focus owner"

9 years agoRecents: Tapping on background returns to launcher
James Cook [Tue, 17 Mar 2015 14:33:28 +0000 (07:33 -0700)]
Recents: Tapping on background returns to launcher

Conceptually the area outside the recents task stack looks like a
"desktop". Make a non-scroll tap outside the task stack close
recents and return to the launcher.

Bug: 19271451
Change-Id: I9e639d6b5c6127bc37e1003152ef7a6fcbc2c2f3

9 years agocamera2: Release surface in ImageReader#close and fix legacy cleanup
Ruben Brunk [Fri, 13 Mar 2015 03:54:03 +0000 (20:54 -0700)]
camera2: Release surface in ImageReader#close and fix legacy cleanup

Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e

9 years agoMerge "Deprecate redundant event, should handle via NotProvisionedException"
Jeff Tinker [Tue, 17 Mar 2015 17:49:10 +0000 (17:49 +0000)]
Merge "Deprecate redundant event, should handle via NotProvisionedException"