OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 695b37cb: am ba061aec: Merge "Promote RenderProperties with an alpha to have a...
Chris Craik [Tue, 28 Apr 2015 14:51:32 +0000 (14:51 +0000)]
am 695b37cb: am ba061aec: Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev

* commit '695b37cb5dc78faf56289231a7f6a6def4b5fb53':
  Promote RenderProperties with an alpha to have a RenderLayer

9 years agoam 692f288a: am e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>...
Dan Stoza [Tue, 28 Apr 2015 14:51:19 +0000 (14:51 +0000)]
am 692f288a: am e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev

* commit '692f288a64d87e426940905c54a874aea6732116':
  ImageWriter: Change detach to sp<GraphicBuffer>

9 years agoam 7c420307: am 580c30a6: Merge "Wire up caller chooser targets for ChooserActivity...
Adam Powell [Tue, 28 Apr 2015 14:51:07 +0000 (14:51 +0000)]
am 7c420307: am 580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev

* commit '7c42030739a5b9418135be798885df68a03c6ac2':
  Wire up caller chooser targets for ChooserActivity

9 years agoam 87e96b66: am 1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings...
Svet Ganov [Tue, 28 Apr 2015 14:50:51 +0000 (14:50 +0000)]
am 87e96b66: am 1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev

* commit '87e96b6609b6a0e073449bade173e9fe7be9826b':
  DO NOT MERGE Do not clean up global/system settings on package unintalls.

9 years agoam 371dd500: am c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java...
Arunesh Mishra [Tue, 28 Apr 2015 14:50:46 +0000 (14:50 +0000)]
am 371dd500: am c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev

* commit '371dd5003e6c470f7021ad1fb8d2c853ecb5ba98':
  Add near-ultrasound properties to AudioManager.java

9 years agoam 5c4eb380: am cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Support...
Scott Rowe [Tue, 28 Apr 2015 14:50:41 +0000 (14:50 +0000)]
am 5c4eb380: am cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '5c4eb38053c029f67de1e069cf42883e0e17e236':

9 years agoam 5ba6a768: am b005be69: am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correct...
Andrew Solovay [Tue, 28 Apr 2015 14:50:36 +0000 (14:50 +0000)]
am 5ba6a768: am b005be69: am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit '5ba6a76884f8cfefc5b40553c78cf94a7003f11f':

9 years agoam b7b997e6: am 0d59144c: am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update...
Andrew Solovay [Tue, 28 Apr 2015 14:50:26 +0000 (14:50 +0000)]
am b7b997e6: am 0d59144c: am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit 'b7b997e6262fc0090f1deba7aeb62a096a1e6da9':

9 years agoam b6dd8354: am a7db8bcb: am 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours...
Quddus Chong [Tue, 28 Apr 2015 14:50:19 +0000 (14:50 +0000)]
am b6dd8354: am a7db8bcb: am 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit 'b6dd8354537496774e84ac25e13d6113507534d8':

9 years agoam 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup...
Julia Reynolds [Tue, 28 Apr 2015 14:50:11 +0000 (14:50 +0000)]
am 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev

* commit '89f193715484c5e10e555aa477012c0246a1827e':
  Allow device initializers to set a preferred setup activity.

9 years agoam 94e3b0c5: am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
Benjamin Franz [Tue, 28 Apr 2015 14:50:05 +0000 (14:50 +0000)]
am 94e3b0c5: am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev

* commit '94e3b0c509aacd8ff0395c56f06a7898eabeca5b':
  Introduce disable2 into StatusBarManager

9 years agoam b268f606: (-s ours) am d727677d: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Tue, 28 Apr 2015 14:50:00 +0000 (14:50 +0000)]
am b268f606: (-s ours) am d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam bbca11e5: (-s ours) am 69812636: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Tue, 28 Apr 2015 14:49:54 +0000 (14:49 +0000)]
am bbca11e5: (-s ours) am 69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"
Narayan Kamath [Tue, 28 Apr 2015 09:48:24 +0000 (09:48 +0000)]
am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"

* commit '71fa6862f307796c659fd4e83a7724dd6851b69e':
  Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray

9 years agoam b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors"
Narayan Kamath [Tue, 28 Apr 2015 09:48:19 +0000 (09:48 +0000)]
am b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors"

* commit 'b736868be917afd5d3ea7e8a8d3d658c4350a239':
  Fix NullPointerException in Bundle#hasFileDescriptors

9 years agoMerge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"
Narayan Kamath [Tue, 28 Apr 2015 08:32:55 +0000 (08:32 +0000)]
Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"

9 years agoFix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
Taiju Tsuiki [Tue, 28 Apr 2015 04:36:15 +0000 (13:36 +0900)]
Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray

Add a null check for each values of SparseArray in Bundle#hasFileDescriptor
to avoid NullPointerException.

Change-Id: I43ecc01f2759ccbe85b902fa118d55cb74ebf38b

9 years agoMerge "Fix NullPointerException in Bundle#hasFileDescriptors"
Narayan Kamath [Tue, 28 Apr 2015 08:29:09 +0000 (08:29 +0000)]
Merge "Fix NullPointerException in Bundle#hasFileDescriptors"

9 years agoFix NullPointerException in Bundle#hasFileDescriptors
Taiju Tsuiki [Wed, 22 Apr 2015 07:59:00 +0000 (16:59 +0900)]
Fix NullPointerException in Bundle#hasFileDescriptors

Add null check for array elements in Bundle#hasFileDescriptors to avoid NPE on
null valued array.

Change-Id: Ic6ef8864ca6add023c7a69ba3c9474b0f6291723

9 years agoam ba061aec: Merge "Promote RenderProperties with an alpha to have a RenderLayer...
Chris Craik [Mon, 27 Apr 2015 20:02:09 +0000 (20:02 +0000)]
am ba061aec: Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev

* commit 'ba061aec249208184d50461d3a8c3a600aa73720':
  Promote RenderProperties with an alpha to have a RenderLayer

9 years agoam e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 19:39:22 +0000 (19:39 +0000)]
am e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev

* commit 'e54fbaa2cea50d47ac93023bb472482018a2c243':
  ImageWriter: Change detach to sp<GraphicBuffer>

9 years agoMerge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
Chris Craik [Mon, 27 Apr 2015 19:28:44 +0000 (19:28 +0000)]
Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev

9 years agoam 580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
Adam Powell [Mon, 27 Apr 2015 18:53:54 +0000 (18:53 +0000)]
am 580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev

* commit '580c30a63353f67433da25ef7b90913300e0372f':
  Wire up caller chooser targets for ChooserActivity

9 years agoMerge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:52:03 +0000 (18:52 +0000)]
Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev

9 years agoImageWriter: Change detach to sp<GraphicBuffer>
Dan Stoza [Mon, 27 Apr 2015 18:31:12 +0000 (11:31 -0700)]
ImageWriter: Change detach to sp<GraphicBuffer>

Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.

Bug: 20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736

9 years agoam 1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings on package...
Svet Ganov [Mon, 27 Apr 2015 18:30:14 +0000 (18:30 +0000)]
am 1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev

* commit '1f0943dd2ce8ae2e9610cd59858fbfd7511d5df3':
  DO NOT MERGE Do not clean up global/system settings on package unintalls.

9 years agoam c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
Arunesh Mishra [Mon, 27 Apr 2015 18:30:07 +0000 (18:30 +0000)]
am c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev

* commit 'c83d46a277c563e0f60bb1b8c3478165de2c121a':
  Add near-ultrasound properties to AudioManager.java

9 years agoam cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media...
Scott Rowe [Mon, 27 Apr 2015 18:30:01 +0000 (18:30 +0000)]
am cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit 'cc637ab0345759040daba736d3b1bf0687d88296':

9 years agoam b005be69: am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section...
Andrew Solovay [Mon, 27 Apr 2015 18:29:54 +0000 (18:29 +0000)]
am b005be69: am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit 'b005be690be4a5851591d35ca2ea07de14176624':

9 years agoam 0d59144c: am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on...
Andrew Solovay [Mon, 27 Apr 2015 18:29:47 +0000 (18:29 +0000)]
am 0d59144c: am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit '0d59144c882856f78d2709d849eee166498ea7a2':

9 years agoam a7db8bcb: am 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs...
Quddus Chong [Mon, 27 Apr 2015 18:29:40 +0000 (18:29 +0000)]
am a7db8bcb: am 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit 'a7db8bcbb357e408c6a5983e16243384e22fee6a':

9 years agoPromote RenderProperties with an alpha to have a RenderLayer
Chris Craik [Tue, 21 Apr 2015 22:13:29 +0000 (15:13 -0700)]
Promote RenderProperties with an alpha to have a RenderLayer

bug:20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc

9 years agoam 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity....
Julia Reynolds [Mon, 27 Apr 2015 18:07:35 +0000 (18:07 +0000)]
am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev

* commit '6ab47fc111a8c5eb814b9bbea7ebd0ae429fa709':
  Allow device initializers to set a preferred setup activity.

9 years agoam 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
Benjamin Franz [Mon, 27 Apr 2015 18:07:29 +0000 (18:07 +0000)]
am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev

* commit '0c2d0deb3666c7bb9c315212f5caec1bc1945611':
  Introduce disable2 into StatusBarManager

9 years agoam d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 18:07:25 +0000 (18:07 +0000)]
am d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 18:07:19 +0000 (18:07 +0000)]
am 69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '69812636853f6195e7f228ac17dc1f984a3ae569':
  Import translations. DO NOT MERGE

9 years agoMerge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
Adam Powell [Mon, 27 Apr 2015 18:03:07 +0000 (18:03 +0000)]
Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev

9 years agoMerge "DO NOT MERGE Do not clean up global/system settings on package unintalls....
Svet Ganov [Mon, 27 Apr 2015 17:50:00 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev

9 years agoMerge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
Arunesh Mishra [Mon, 27 Apr 2015 17:49:48 +0000 (17:49 +0000)]
Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev

9 years agoDO NOT MERGE Do not clean up global/system settings on package unintalls.
Svet Ganov [Mon, 27 Apr 2015 16:33:40 +0000 (09:33 -0700)]
DO NOT MERGE Do not clean up global/system settings on package unintalls.

Legacy apps can write their own entries in the system settings and
when they get uninstalled these are hanging around forever polluting
the settings table. We keep track of which settings an app added and
when the app is uninstalled we drop its custom entries. The trouble
was that we did the same thing for global and secure settings with
no explicit list of platform defined settings. Hence, if say a test
signed by the platform certificate touches platform defined global
or secure settings and is then uninstalled, we would drop the platform
defined entries portentially crippling the system.

bug:20113160

Change-Id: Ia21694f6326ad4a1795c4666027b366e26c05a23
(cherry picked from commit b128540dc741c424d4f652419686882b7a3bfa06)

9 years agoam 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs...
Scott Rowe [Mon, 27 Apr 2015 17:48:38 +0000 (17:48 +0000)]
am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':

9 years agoam ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to...
Andrew Solovay [Mon, 27 Apr 2015 17:48:32 +0000 (17:48 +0000)]
am ec472abf: am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit 'ec472abfa22ecbd42f295fb17bd9414386c6a065':

9 years agoam bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for...
Andrew Solovay [Mon, 27 Apr 2015 17:48:27 +0000 (17:48 +0000)]
am bd719d7b: am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit 'bd719d7ba94b87ec89cbdbfde74f007bb1047d2b':

9 years agoam 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd...
Quddus Chong [Mon, 27 Apr 2015 17:48:21 +0000 (17:48 +0000)]
am 5edfdac4: am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit '5edfdac4b8264e3c94673eaede8f17a3568b8496':

9 years agoam cdf517a6: (-s ours) am ba474807: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 17:46:47 +0000 (17:46 +0000)]
am cdf517a6: (-s ours) am ba474807: (-s ours) Import translations. DO NOT MERGE

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

9 years agoAdd near-ultrasound properties to AudioManager.java
Arunesh Mishra [Mon, 27 Apr 2015 16:39:00 +0000 (09:39 -0700)]
Add near-ultrasound properties to AudioManager.java

Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc

9 years agoMerge "Allow device initializers to set a preferred setup activity." into mnc-dev
Julia Reynolds [Mon, 27 Apr 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Allow device initializers to set a preferred setup activity." into mnc-dev

9 years agoresolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
Andreas Gampe [Mon, 27 Apr 2015 17:18:08 +0000 (10:18 -0700)]
resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp

Change-Id: I0e3dacbdfb68d6bb31800ff2e9969b96e63634b6

9 years agoWire up caller chooser targets for ChooserActivity
Adam Powell [Fri, 24 Apr 2015 00:19:37 +0000 (17:19 -0700)]
Wire up caller chooser targets for ChooserActivity

Add the caller-supplied ChooserTargets from EXTRA_CHOOSER_TARGETS in
the default ChooserActivity. These appear before other options.

Change-Id: Ic4d23ae9ecdfd0cc8a5ac077696d7334a8f844a6

9 years agoMerge "Introduce disable2 into StatusBarManager" into mnc-dev
Benjamin Franz [Mon, 27 Apr 2015 17:03:16 +0000 (17:03 +0000)]
Merge "Introduce disable2 into StatusBarManager" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 17:02:14 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 17:00:00 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE

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

9 years agoAllow device initializers to set a preferred setup activity.
Julia Reynolds [Mon, 20 Apr 2015 20:42:54 +0000 (16:42 -0400)]
Allow device initializers to set a preferred setup activity.

This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.

Bug: 20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1

9 years agoIntroduce disable2 into StatusBarManager
Benjamin Franz [Thu, 23 Apr 2015 16:19:48 +0000 (17:19 +0100)]
Introduce disable2 into StatusBarManager

We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.

Bug: 20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065

9 years agoam 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats...
Scott Rowe [Mon, 27 Apr 2015 16:33:01 +0000 (16:33 +0000)]
am 63604283: am 02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs

* commit '6360428359bd1a4db1c9a569d8f9e1af8baf29fb':

9 years agoam 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes...
Andrew Solovay [Mon, 27 Apr 2015 16:32:56 +0000 (16:32 +0000)]
am 44199d26: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs

* commit '44199d26d2305b45086695acb1c851aae7328706':

9 years agoam 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions...
Andrew Solovay [Mon, 27 Apr 2015 16:32:50 +0000 (16:32 +0000)]
am 19bc81db: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs

* commit '19bc81dbbaeef90f1417d78a18a96120b8d81762':

9 years agoam a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs...
Quddus Chong [Mon, 27 Apr 2015 16:32:44 +0000 (16:32 +0000)]
am a76a3dd3: (-s ours) am f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs

* commit 'a76a3dd3a90451e78672ccd52b004e6948bf21b7':

9 years agoMerge "Frameworks/base: Add debug.gencfi property"
Andreas Gampe [Mon, 27 Apr 2015 15:06:46 +0000 (15:06 +0000)]
Merge "Frameworks/base: Add debug.gencfi property"

9 years agoam ba474807: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:38:53 +0000 (14:38 +0000)]
am ba474807: (-s ours) Import translations. DO NOT MERGE

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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 27 Apr 2015 14:35:58 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:33:21 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 14:18:39 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam bde00321: am 28b5b144: Fix: Selection handles are wrongly shown.
Keisuke Kuroyanagi [Mon, 27 Apr 2015 12:50:49 +0000 (12:50 +0000)]
am bde00321: am 28b5b144: Fix: Selection handles are wrongly shown.

* commit 'bde0032125e9e8199502e38c81cf2d47d2c0811c':
  Fix: Selection handles are wrongly shown.

9 years agoam 6d3d965d: am 78f895a7: am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge...
Quddus Chong [Mon, 27 Apr 2015 12:50:35 +0000 (12:50 +0000)]
am 6d3d965d: am 78f895a7: am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '6d3d965de20d382a1ac53d020e8b362788db0499':

9 years agoam 06bdd4d7: am 3af9c46c: am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capab...
Luan Nguyen [Mon, 27 Apr 2015 12:50:22 +0000 (12:50 +0000)]
am 06bdd4d7: am 3af9c46c: am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '06bdd4d7a94a8f5f839a9abfac61cca568689e31':

9 years agoam 42bca740: am 27e6c228: am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add...
Luan Nguyen [Mon, 27 Apr 2015 12:50:17 +0000 (12:50 +0000)]
am 42bca740: am 27e6c228: am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit '42bca740c778c8534d453a022f9c022fbad9b678':

9 years agoam d78ebfe5: am fbc860a7: am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd...
Quddus Chong [Mon, 27 Apr 2015 12:50:12 +0000 (12:50 +0000)]
am d78ebfe5: am fbc860a7: am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit 'd78ebfe5ea7fc6e06c8dca2af81f8abcbc5298d1':

9 years agoam 18c6f10d: am 59b0ea26: am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 12:50:03 +0000 (12:50 +0000)]
am 18c6f10d: am 59b0ea26: am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '18c6f10d79739683e72bbc8e1e8346cb6a8da817':

9 years agoam 728e2d73: am 34dccc42: am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change...
Dirk Dougherty [Mon, 27 Apr 2015 12:49:58 +0000 (12:49 +0000)]
am 728e2d73: am 34dccc42: am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '728e2d739fc4f636b7078abf398bd089709e42cd':

9 years agoam 16e631e5: am db1d9829: am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio...
Rich Slogar [Mon, 27 Apr 2015 12:49:45 +0000 (12:49 +0000)]
am 16e631e5: am db1d9829: am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '16e631e5fb326c53ae5d33679c57515baad18754':

9 years agoam c15c8113: am 9b963b16: am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarc...
Rich Slogar [Mon, 27 Apr 2015 12:49:40 +0000 (12:49 +0000)]
am c15c8113: am 9b963b16: am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit 'c15c81138e83e0930a0a3376bb3450d6331114ee':

9 years agoam 48d75ee8: (-s ours) am a818a46c: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 27 Apr 2015 12:48:37 +0000 (12:48 +0000)]
am 48d75ee8: (-s ours) am a818a46c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '48d75ee831a0bc4d0b4cd0d5b7550eb518cd3667':
  Import translations. DO NOT MERGE

9 years agoam 5bb07d3d: (-s ours) am 694a55b6: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 27 Apr 2015 12:48:32 +0000 (12:48 +0000)]
am 5bb07d3d: (-s ours) am 694a55b6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5bb07d3d5dd6cff9daeaea72bf454c9fae5a1c9a':
  Import translations. DO NOT MERGE

9 years agoam ed674f5c: (-s ours) am df9fd7c8: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Apr 2015 12:48:27 +0000 (12:48 +0000)]
am ed674f5c: (-s ours) am df9fd7c8: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter."
Narayan Kamath [Mon, 27 Apr 2015 11:35:12 +0000 (11:35 +0000)]
am cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter."

* commit 'cf6fc5ee13e549c6ce1a6a4fc417aa13fc0dfa17':
  Fix incorrect javadoc for Uri.getQueryParameter.

9 years agoMerge "Fix incorrect javadoc for Uri.getQueryParameter."
Narayan Kamath [Mon, 27 Apr 2015 10:44:34 +0000 (10:44 +0000)]
Merge "Fix incorrect javadoc for Uri.getQueryParameter."

9 years agoFix incorrect javadoc for Uri.getQueryParameter.
Narayan Kamath [Mon, 27 Apr 2015 10:00:54 +0000 (11:00 +0100)]
Fix incorrect javadoc for Uri.getQueryParameter.

This first went out with Jelly Bean and not ICS.

bug: https://code.google.com/p/android/issues/detail?id=61651
Change-Id: I26f6b18593fe089bd3a52ec1d159494923bcbad1

9 years agoam 28b5b144: Fix: Selection handles are wrongly shown.
Keisuke Kuroyanagi [Mon, 27 Apr 2015 10:31:28 +0000 (10:31 +0000)]
am 28b5b144: Fix: Selection handles are wrongly shown.

* commit '28b5b1444965fcdb471a8c2ff09f6f2eb53b337b':
  Fix: Selection handles are wrongly shown.

9 years agoFix: Selection handles are wrongly shown.
Keisuke Kuroyanagi [Wed, 22 Apr 2015 12:27:08 +0000 (21:27 +0900)]
Fix: Selection handles are wrongly shown.

Selection handles were always shown when selection action
mode is started at first time. When the action mode is
started without a selection, only insertion handle must be
shown.

Bug: 20264980
Bug: 20407551

Change-Id: I630804e007f795d28f87e3fa6cba0de5bf588c78

9 years agoam 78f895a7: am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added...
Quddus Chong [Mon, 27 Apr 2015 09:48:20 +0000 (09:48 +0000)]
am 78f895a7: am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '78f895a7108a25d65df74392cb3a12af32b06bae':

9 years agoam 3af9c46c: am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 09:48:16 +0000 (09:48 +0000)]
am 3af9c46c: am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '3af9c46c57f55e42369626e1265c67ca1ed9d912':

9 years agoam 27e6c228: am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API...
Luan Nguyen [Mon, 27 Apr 2015 09:48:11 +0000 (09:48 +0000)]
am 27e6c228: am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit '27e6c228c2ee68983d31daf0f9ba78e7fb554610':

9 years agoam fbc860a7: am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs...
Quddus Chong [Mon, 27 Apr 2015 09:48:05 +0000 (09:48 +0000)]
am fbc860a7: am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit 'fbc860a7195d4364047492f4258cfa6ff1fdfd16':

9 years agoam 59b0ea26: am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 09:48:00 +0000 (09:48 +0000)]
am 59b0ea26: am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit '59b0ea26b6e0792a1c85f614024e983ad4a448d9':

9 years agoam 34dccc42: am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute...
Dirk Dougherty [Mon, 27 Apr 2015 09:47:56 +0000 (09:47 +0000)]
am 34dccc42: am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '34dccc421906e8df20bde1f33394e53e22dea20a':

9 years agoam db1d9829: am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle...
Rich Slogar [Mon, 27 Apr 2015 09:47:48 +0000 (09:47 +0000)]
am db1d9829: am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit 'db1d98298eb9682582126f3d02bf79e03ae778f2':

9 years agoam 9b963b16: am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer...
Rich Slogar [Mon, 27 Apr 2015 09:47:40 +0000 (09:47 +0000)]
am 9b963b16: am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '9b963b16f65e0d4dc9d798247bec4fb6d29a50f0':

9 years agoam 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New secti...
Quddus Chong [Mon, 27 Apr 2015 08:16:18 +0000 (08:16 +0000)]
am 41df3b4b: am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit '41df3b4b4f3601567003cbbc742dbb748b4f01fe':

9 years agoam 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 08:16:13 +0000 (08:16 +0000)]
am 0233b9aa: am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '0233b9aa462ac42a8dec3b61d4168d9e64ca93e1':

9 years agoam bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear...
Luan Nguyen [Mon, 27 Apr 2015 08:16:07 +0000 (08:16 +0000)]
am bcfee811: am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit 'bcfee8112a386f06b94d319bf3e477c36766e295':

9 years agoam c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android...
Quddus Chong [Mon, 27 Apr 2015 08:16:01 +0000 (08:16 +0000)]
am c141efed: am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit 'c141efed1b6edc496c65a056264748cee102f2d9':

9 years agoam ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribu...
Ryosuke Matsuuchi [Mon, 27 Apr 2015 08:15:55 +0000 (08:15 +0000)]
am ed6c8ff1: am 3cd98ab6: am 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs

* commit 'ed6c8ff17f61b547f4f2a85776e514f8ab5a5241':

9 years agoam 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page...
Dirk Dougherty [Mon, 27 Apr 2015 08:15:50 +0000 (08:15 +0000)]
am 7f2bdf88: am d668578f: am ff233af7: Merge "Doc change: distribute landing page." into lmp-docs

* commit '7f2bdf885d0b72fa6e4c21953d0a0ca5d53ebbd1':

9 years agoam 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog...
Rich Slogar [Mon, 27 Apr 2015 08:15:43 +0000 (08:15 +0000)]
am 74c57402: am 03389e7e: am 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs

* commit '74c574027c409cd071476559de1a66515d7b8fa2':

9 years agoam 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into...
Rich Slogar [Mon, 27 Apr 2015 08:15:37 +0000 (08:15 +0000)]
am 4b79a147: am 5fb293b2: am efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs

* commit '4b79a1477db467561cf6af874eb1770f355a9a5b':

9 years agoam ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS...
Quddus Chong [Mon, 27 Apr 2015 07:49:29 +0000 (07:49 +0000)]
am ab52769b: am 789c5971: (-s ours) Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs

* commit 'ab52769be2d2dc33a520459194f1e007f03970e4':

9 years agoam 4f50a2b1: am 33ac358a: docs: Add Wear Capability training
Luan Nguyen [Mon, 27 Apr 2015 07:49:23 +0000 (07:49 +0000)]
am 4f50a2b1: am 33ac358a: docs: Add Wear Capability training

* commit '4f50a2b173e31accd8f1fbdde7e9b038914746e7':

9 years agoam bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp...
Luan Nguyen [Mon, 27 Apr 2015 07:49:16 +0000 (07:49 +0000)]
am bed3f49b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs

* commit 'bed3f49b5547642c76901d848c08163463ab4fbe':

9 years agoam 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing...
Quddus Chong [Mon, 27 Apr 2015 07:49:10 +0000 (07:49 +0000)]
am 9c8f8117: am 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402

* commit '9c8f8117c1ed2fbf2181011116287b5f6c6dbe9d':