OSDN Git Service

android-x86/frameworks-base.git
10 years agoam c44b51bd: Merge "Camera2: Update stream num tag specs"
Zhijun He [Wed, 5 Feb 2014 19:30:59 +0000 (11:30 -0800)]
am c44b51bd: Merge "Camera2: Update stream num tag specs"

* commit 'c44b51bdebd901def3015591814a57964f0adeef':
  Camera2: Update stream num tag specs

10 years agoMerge "Camera2: Update stream num tag specs"
Zhijun He [Wed, 5 Feb 2014 19:28:43 +0000 (19:28 +0000)]
Merge "Camera2: Update stream num tag specs"

10 years agoam 5325019a: (-s ours) Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 5 Feb 2014 19:09:02 +0000 (11:09 -0800)]
am 5325019a: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '5325019a1afa3d43efcc0c827611a863ebf5d515':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 5 Feb 2014 19:06:05 +0000 (19:06 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoam 0e69ab07: (-s ours) Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 5 Feb 2014 18:57:23 +0000 (10:57 -0800)]
am 0e69ab07: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '0e69ab076c0f9bfea33381de4ddf2202e3540f46':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Feb 2014 18:57:18 +0000 (10:57 -0800)]
Import translations. DO NOT MERGE

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

10 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 5 Feb 2014 18:56:00 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Feb 2014 18:48:38 +0000 (10:48 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam cb1b23b5: Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made...
Andreas Huber [Wed, 5 Feb 2014 18:44:02 +0000 (10:44 -0800)]
am cb1b23b5: Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"

* commit 'cb1b23b5e600abe542e3374b66c2be7976fccd72':
  FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code

10 years agoam 829a57c9: Merge "Cache media/nomedia paths"
Marco Nelissen [Wed, 5 Feb 2014 18:43:59 +0000 (10:43 -0800)]
am 829a57c9: Merge "Cache media/nomedia paths"

* commit '829a57c9a52d6cd11916b926491f8addcef526ec':
  Cache media/nomedia paths

10 years agoam 33e77b61: Merge "Revert "Camera2: Update stream num tag specs""
Narayan Kamath [Wed, 5 Feb 2014 18:43:56 +0000 (10:43 -0800)]
am 33e77b61: Merge "Revert "Camera2: Update stream num tag specs""

* commit '33e77b61b8c170166206fbdacb157e56955bebc8':
  Revert "Camera2: Update stream num tag specs"

10 years agoam dbe576eb: Merge "Add new RIL commands to read/write NV items and reset NV config."
Jake Hamby [Wed, 5 Feb 2014 18:43:53 +0000 (10:43 -0800)]
am dbe576eb: Merge "Add new RIL commands to read/write NV items and reset NV config."

* commit 'dbe576ebd1c6bc05d17657aedb3f2feec162f2b1':
  Add new RIL commands to read/write NV items and reset NV config.

10 years agoMerge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available...
Andreas Huber [Wed, 5 Feb 2014 17:13:07 +0000 (17:13 +0000)]
Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"

10 years agoCamera2: Update stream num tag specs
Zhijun He [Wed, 5 Feb 2014 15:55:44 +0000 (07:55 -0800)]
Camera2: Update stream num tag specs

Change-Id: Iba6f1f8c779e5c3a622a7f07029f4373a887bffe

10 years agoMerge "Cache media/nomedia paths"
Marco Nelissen [Wed, 5 Feb 2014 15:41:55 +0000 (15:41 +0000)]
Merge "Cache media/nomedia paths"

10 years agoMerge "Revert "Camera2: Update stream num tag specs""
Narayan Kamath [Wed, 5 Feb 2014 12:19:14 +0000 (12:19 +0000)]
Merge "Revert "Camera2: Update stream num tag specs""

10 years agoRevert "Camera2: Update stream num tag specs"
Narayan Kamath [Wed, 5 Feb 2014 12:16:46 +0000 (12:16 +0000)]
Revert "Camera2: Update stream num tag specs"

This reverts commit 67c23833f81cb27671ee9f62a87ba810d0d49989.

Change-Id: I3aa2d0b245c998c57f3312e2d6f68aa72d80c338

10 years agoMerge "Add new RIL commands to read/write NV items and reset NV config."
Jake Hamby [Wed, 5 Feb 2014 03:56:02 +0000 (03:56 +0000)]
Merge "Add new RIL commands to read/write NV items and reset NV config."

10 years agoam 11579e55: Merge "Import updated SearchView assets from UX"
Adam Powell [Wed, 5 Feb 2014 02:30:18 +0000 (18:30 -0800)]
am 11579e55: Merge "Import updated SearchView assets from UX"

* commit '11579e559593b8c271247fe548f6446af7f6e1ca':
  Import updated SearchView assets from UX

10 years agoMerge "Import updated SearchView assets from UX"
Adam Powell [Wed, 5 Feb 2014 02:28:13 +0000 (02:28 +0000)]
Merge "Import updated SearchView assets from UX"

10 years agoImport updated SearchView assets from UX
Adam Powell [Wed, 5 Feb 2014 02:20:56 +0000 (18:20 -0800)]
Import updated SearchView assets from UX

Bug 12233992

Change-Id: I6624d0d7625121a8905efa697c6a183b4463a289

10 years agoam 278a5619: am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs...
Stephen Hines [Wed, 5 Feb 2014 02:12:43 +0000 (18:12 -0800)]
am 278a5619: am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."

* commit '278a5619256cd96763775cea6da7aadc894d962a':
  Add message to RS docs about application vs. library packaging.

10 years agoam 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about applicatio...
Stephen Hines [Wed, 5 Feb 2014 02:09:21 +0000 (02:09 +0000)]
am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."

* commit '34b84e691c4d5bd853bc5b7c7ccb8040590359d6':
  Add message to RS docs about application vs. library packaging.

10 years agoam 67c23833: Camera2: Update stream num tag specs
Zhijun He [Wed, 5 Feb 2014 02:06:50 +0000 (18:06 -0800)]
am 67c23833: Camera2: Update stream num tag specs

* commit '67c23833f81cb27671ee9f62a87ba810d0d49989':
  Camera2: Update stream num tag specs

10 years agoCamera2: Update stream num tag specs
Zhijun He [Wed, 5 Feb 2014 02:02:07 +0000 (18:02 -0800)]
Camera2: Update stream num tag specs

Change-Id: I69ae1a34828230408a27bf7c016eb514485097b1

10 years agoam eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library...
Stephen Hines [Wed, 5 Feb 2014 02:00:43 +0000 (02:00 +0000)]
am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."

* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.

10 years agoam bc80e40b: Merge "Add message to RS docs about application vs. library packaging."
Stephen Hines [Wed, 5 Feb 2014 01:57:11 +0000 (17:57 -0800)]
am bc80e40b: Merge "Add message to RS docs about application vs. library packaging."

* commit 'bc80e40b160596c262fee0ee4df4b9f15cc14e89':
  Add message to RS docs about application vs. library packaging.

10 years agoMerge "Add message to RS docs about application vs. library packaging."
Stephen Hines [Wed, 5 Feb 2014 01:52:31 +0000 (01:52 +0000)]
Merge "Add message to RS docs about application vs. library packaging."

10 years agoam 7b24aee7: Merge "Pass a thread name to AttachCurrentThread"
Andy McFadden [Wed, 5 Feb 2014 00:39:44 +0000 (16:39 -0800)]
am 7b24aee7: Merge "Pass a thread name to AttachCurrentThread"

* commit '7b24aee7071f085c2407313a609ba18e9c42ce5b':
  Pass a thread name to AttachCurrentThread

10 years agoMerge "Pass a thread name to AttachCurrentThread"
Andy McFadden [Wed, 5 Feb 2014 00:37:32 +0000 (00:37 +0000)]
Merge "Pass a thread name to AttachCurrentThread"

10 years agoam 8adb491e: Merge "Cross-Activity Scene transition API."
George Mount [Wed, 5 Feb 2014 00:24:47 +0000 (16:24 -0800)]
am 8adb491e: Merge "Cross-Activity Scene transition API."

* commit '8adb491e08b79657deedc13c427f785c889ee448':
  Cross-Activity Scene transition API.

10 years agoMerge "Cross-Activity Scene transition API."
George Mount [Wed, 5 Feb 2014 00:23:03 +0000 (00:23 +0000)]
Merge "Cross-Activity Scene transition API."

10 years agoCross-Activity Scene transition API.
George Mount [Fri, 13 Dec 2013 21:35:36 +0000 (13:35 -0800)]
Cross-Activity Scene transition API.

First pass at API for cross-Activity Scene transitions.
Remaining work:
  Transition back
  Automatically capture hero element info
  Transfer of surface texture to synchronize between Activities
  Possibly use scene names to indicate preferred transition

Change-Id: I59d07de1fae694a46b92b1c82525daa301ec1377

10 years agoPass a thread name to AttachCurrentThread
Andy McFadden [Tue, 4 Feb 2014 23:59:39 +0000 (15:59 -0800)]
Pass a thread name to AttachCurrentThread

Reduces logspam from ART.

Bug 12896873

Change-Id: I82ae8e2dbba3918071d9c28f5ae5c882f8dcab3a

10 years agoam 9e4adfb3: resolved conflicts for merge of 32360147 to master
Craig Mautner [Tue, 4 Feb 2014 23:59:18 +0000 (15:59 -0800)]
am 9e4adfb3: resolved conflicts for merge of 32360147 to master

* commit '9e4adfb358ca3680288c07201efc8811472a579d':
  Add IIntentSender to ActivityContainer.startActivity

10 years agoresolved conflicts for merge of 32360147 to master
Craig Mautner [Tue, 4 Feb 2014 23:55:19 +0000 (15:55 -0800)]
resolved conflicts for merge of 32360147 to master

Change-Id: I97cc95f66df50006469f8debd286966cc21edb60

10 years agoam df88d730: Add IIntentSender to ActivityContainer.startActivity
Craig Mautner [Tue, 4 Feb 2014 23:38:28 +0000 (23:38 +0000)]
am df88d730: Add IIntentSender to ActivityContainer.startActivity

* commit 'df88d73092c62a1a3cd2b2056ca63ae2e70cc238':
  Add IIntentSender to ActivityContainer.startActivity

10 years agoAdd IIntentSender to ActivityContainer.startActivity
Craig Mautner [Mon, 27 Jan 2014 17:21:32 +0000 (09:21 -0800)]
Add IIntentSender to ActivityContainer.startActivity

PendingIntents and IntentSenders can now be launched. Still does not
work once the host activity has been paused and resumed.

Window manager TaskStacks now exist independently of Displays and app
windows persist after Displays are removed below them. Attaching the
stack to a new Display does not yet restore the windows to it.

Fixes bug 12747909.

Change-Id: I509007ee23fda400b353f483cf6ecce08177763b

10 years agoFINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media...
Andreas Huber [Wed, 29 Jan 2014 18:32:46 +0000 (10:32 -0800)]
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code

Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8

10 years agoam 143b46d5: Check for null display list
Alan Viverette [Tue, 4 Feb 2014 22:21:58 +0000 (14:21 -0800)]
am 143b46d5: Check for null display list

* commit '143b46d50c0c01970c7d280228bd1e58c2afb32b':
  Check for null display list

10 years agoCheck for null display list
Alan Viverette [Tue, 4 Feb 2014 22:19:06 +0000 (14:19 -0800)]
Check for null display list

BUG: 12764584
Change-Id: I071aa0d9bc4f4ac353a5d0f534cf7c44964d4bf0

10 years agoam 9f244efb: Merge "Make background projection a property of View"
Alan Viverette [Tue, 4 Feb 2014 22:08:09 +0000 (14:08 -0800)]
am 9f244efb: Merge "Make background projection a property of View"

* commit '9f244efbfac8d592a0af0321f7985761ed17ec6c':
  Make background projection a property of View

10 years agoMerge "Make background projection a property of View"
Alan Viverette [Tue, 4 Feb 2014 22:05:26 +0000 (22:05 +0000)]
Merge "Make background projection a property of View"

10 years agoam 40675bdd: Merge "camera3: Update maxRegions tag."
Ruben Brunk [Tue, 4 Feb 2014 21:04:15 +0000 (13:04 -0800)]
am 40675bdd: Merge "camera3: Update maxRegions tag."

* commit '40675bdd3857a9e29b2e61b5bc1660e9bb2e82a2':
  camera3: Update maxRegions tag.

10 years agoMerge "camera3: Update maxRegions tag."
Ruben Brunk [Tue, 4 Feb 2014 21:01:19 +0000 (21:01 +0000)]
Merge "camera3: Update maxRegions tag."

10 years agoCache media/nomedia paths
Marco Nelissen [Tue, 4 Feb 2014 20:52:10 +0000 (12:52 -0800)]
Cache media/nomedia paths

Instead of checking all the parents of every path for presence of
a .nomedia file every time a new entry is inserted, build a cache
of paths and use that when possible.

Change-Id: I5b912fd54473db8f96d3511cbc2715e0b69dd16b

10 years agoam 07f00e74: Merge "Update APIs from RotateDrawable change"
Alan Viverette [Tue, 4 Feb 2014 19:39:24 +0000 (11:39 -0800)]
am 07f00e74: Merge "Update APIs from RotateDrawable change"

* commit '07f00e74029cbe80cd4353955dbaae7e828b8e70':
  Update APIs from RotateDrawable change

10 years agoMerge "Update APIs from RotateDrawable change"
Alan Viverette [Tue, 4 Feb 2014 19:37:41 +0000 (19:37 +0000)]
Merge "Update APIs from RotateDrawable change"

10 years agoUpdate APIs from RotateDrawable change
Alan Viverette [Tue, 4 Feb 2014 19:37:05 +0000 (11:37 -0800)]
Update APIs from RotateDrawable change

Change-Id: I89b1ef79360231912e16d60b20c2a52d4dc2c94e

10 years agoam 45d1cc58: am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbao...
Scott Main [Tue, 4 Feb 2014 19:35:45 +0000 (11:35 -0800)]
am 45d1cc58: am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14

* commit '45d1cc587bec8770e3f56a194c27452b933cc058':
  dashbaord update for feb '14

10 years agoam 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update...
Scott Main [Tue, 4 Feb 2014 19:33:26 +0000 (19:33 +0000)]
am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14

* commit '35a254554787196cf835536cc3bc28f9ee890af4':
  dashbaord update for feb '14

10 years agoam 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14
Scott Main [Tue, 4 Feb 2014 19:25:04 +0000 (19:25 +0000)]
am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14

* commit '70f908d7af916bf0e5b6af2913752dca431b837f':
  dashbaord update for feb '14

10 years agoam b8771938: Merge "Clean up RotateDrawable, add getters and setters for XML properties"
Alan Viverette [Tue, 4 Feb 2014 19:24:04 +0000 (11:24 -0800)]
am b8771938: Merge "Clean up RotateDrawable, add getters and setters for XML properties"

* commit 'b8771938daf6a2e40fdbf97d60bfdb2b0fe8ccd9':
  Clean up RotateDrawable, add getters and setters for XML properties

10 years agoam 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14
Scott Main [Tue, 4 Feb 2014 19:22:02 +0000 (19:22 +0000)]
am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14

* commit '3e80914d1683d1641fd6a01f14f126452e17f5c7':
  dashbaord update for feb '14

10 years agoam eea15edc: am 749120f3: dashbaord update for feb \'14
Scott Main [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am eea15edc: am 749120f3: dashbaord update for feb \'14

* commit 'eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
  dashbaord update for feb '14

10 years agoMerge "Clean up RotateDrawable, add getters and setters for XML properties"
Alan Viverette [Tue, 4 Feb 2014 19:19:18 +0000 (19:19 +0000)]
Merge "Clean up RotateDrawable, add getters and setters for XML properties"

10 years agoMake background projection a property of View
Alan Viverette [Tue, 4 Feb 2014 19:17:32 +0000 (11:17 -0800)]
Make background projection a property of View

BUG: 12764584
Change-Id: Id80afd6d26c814d3fd551f6690d4a88c441b0b9f

10 years agoam 749120f3: dashbaord update for feb \'14
Scott Main [Tue, 4 Feb 2014 19:15:36 +0000 (19:15 +0000)]
am 749120f3: dashbaord update for feb \'14

* commit '749120f39bdac49a96771d06d25b7f9edf70be67':
  dashbaord update for feb '14

10 years agoam c734de9c: am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge...
Glenn Kasten [Tue, 4 Feb 2014 19:07:05 +0000 (11:07 -0800)]
am c734de9c: am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs

* commit 'c734de9c2bcd17e5b07647002acb11afcf19aff6':
  Add adb over Wi-Fi

10 years agoam 94c40a4c: resolved conflicts for merge of 1b5b60d6 to master
Adam Lesinski [Tue, 4 Feb 2014 19:03:35 +0000 (11:03 -0800)]
am 94c40a4c: resolved conflicts for merge of 1b5b60d6 to master

* commit '94c40a4cf90933216e6d656213dfdfa19c68a9c3':
  Add support for multiple asset dirs (-A)

10 years agoam 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over...
Glenn Kasten [Tue, 4 Feb 2014 19:02:57 +0000 (19:02 +0000)]
am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs

* commit '9d2ad12181a1793686d7cdbdf11b3aa5a92030c4':
  Add adb over Wi-Fi

10 years agoresolved conflicts for merge of 1b5b60d6 to master
Adam Lesinski [Tue, 4 Feb 2014 19:00:03 +0000 (11:00 -0800)]
resolved conflicts for merge of 1b5b60d6 to master

Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460

10 years agodashbaord update for feb '14
Scott Main [Tue, 4 Feb 2014 18:57:47 +0000 (10:57 -0800)]
dashbaord update for feb '14

Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2

10 years agoam 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into...
Glenn Kasten [Tue, 4 Feb 2014 18:40:09 +0000 (18:40 +0000)]
am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs

* commit '830d4ffcb79fd2a676942a87d9fe661725d745f3':
  Add adb over Wi-Fi

10 years agoam 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
Adam Lesinski [Tue, 4 Feb 2014 18:36:10 +0000 (18:36 +0000)]
am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev

* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
  Add support for multiple asset dirs (-A)

10 years agoam 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
Glenn Kasten [Tue, 4 Feb 2014 18:35:30 +0000 (18:35 +0000)]
am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs

* commit '74dc4bd09e0dce4855c15cae31dcdd42b05d3532':
  Add adb over Wi-Fi

10 years agoam 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
Glenn Kasten [Tue, 4 Feb 2014 18:32:10 +0000 (18:32 +0000)]
am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs

* commit '983a9381b87519ddd1c6e12e44a8762dc805894a':
  Add adb over Wi-Fi

10 years agoMerge "Add support for multiple asset dirs (-A)" into klp-modular-dev
Adam Lesinski [Tue, 4 Feb 2014 18:31:23 +0000 (18:31 +0000)]
Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev

10 years agoam 11263b24: Merge "Add adb over Wi-Fi" into klp-docs
Glenn Kasten [Tue, 4 Feb 2014 18:29:17 +0000 (18:29 +0000)]
am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs

* commit '11263b24230a0d5db363d76ad199d692bcff1b35':
  Add adb over Wi-Fi

10 years agoMerge "Add adb over Wi-Fi" into klp-docs
Glenn Kasten [Tue, 4 Feb 2014 18:27:11 +0000 (18:27 +0000)]
Merge "Add adb over Wi-Fi" into klp-docs

10 years agoam 2a1fdefe: am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge...
Ricardo Cervera [Tue, 4 Feb 2014 17:38:33 +0000 (09:38 -0800)]
am 2a1fdefe: am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit '2a1fdefe16046860fcaf524af4fc380d850d28bb':
  docs: Added note on multiple build.gradle files. Bug: 12870006

10 years agoam 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added...
Ricardo Cervera [Tue, 4 Feb 2014 17:35:37 +0000 (17:35 +0000)]
am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit '1441acdd6d0f08b00493478386e1b74df47e243b':
  docs: Added note on multiple build.gradle files. Bug: 12870006

10 years agoam 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multip...
Ricardo Cervera [Tue, 4 Feb 2014 17:29:40 +0000 (17:29 +0000)]
am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit '6dea46b2e567f614244100f542dce04e44c26bee':
  docs: Added note on multiple build.gradle files. Bug: 12870006

10 years agoam f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build...
Ricardo Cervera [Tue, 4 Feb 2014 17:26:58 +0000 (17:26 +0000)]
am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit 'f7c12817dc700a5e3d9e4dd3de6b1b50688a4129':
  docs: Added note on multiple build.gradle files. Bug: 12870006

10 years agoam b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files...
Ricardo Cervera [Tue, 4 Feb 2014 17:24:28 +0000 (17:24 +0000)]
am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit 'b180bff575b25ab6b692327a3be244310fd90c5e':
  docs: Added note on multiple build.gradle files. Bug: 12870006

10 years agoam ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006...
Ricardo Cervera [Tue, 4 Feb 2014 17:21:18 +0000 (17:21 +0000)]
am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit 'ccec0906bd358ffa9fbac8f8c882f582c43b6092':
  docs: Added note on multiple build.gradle files. Bug: 12870006

10 years agoMerge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs
Ricardo Cervera [Tue, 4 Feb 2014 17:18:59 +0000 (17:18 +0000)]
Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

10 years agoam 80ddc855: remove samples page under tools. redirect in separate cl. bug: 12878293
Scott Main [Tue, 4 Feb 2014 17:01:59 +0000 (09:01 -0800)]
am 80ddc855: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit '80ddc85515abc2da10a5bce16fcf491e0a31522b':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agoremove samples page under tools. redirect in separate cl.
Scott Main [Tue, 4 Feb 2014 01:07:27 +0000 (17:07 -0800)]
remove samples page under tools. redirect in separate cl.
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

Conflicts:
docs/html/tools/samples/index.jd

10 years agoam c8f40700: am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a7...
Scott Main [Tue, 4 Feb 2014 15:43:58 +0000 (07:43 -0800)]
am c8f40700: am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit 'c8f4070018d5b6cf69274b977fff4199b71cbb70':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agoam e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove...
Scott Main [Tue, 4 Feb 2014 15:39:46 +0000 (15:39 +0000)]
am e4cf2729: (-s ours) am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit 'e4cf272967d6cbfc8e9e7c5c2756651e306a2755':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agoam 8eea3ea5: Add APIs for obtaining themed Drawable from Theme, Context
Alan Viverette [Tue, 4 Feb 2014 03:04:27 +0000 (19:04 -0800)]
am 8eea3ea5: Add APIs for obtaining themed Drawable from Theme, Context

* commit '8eea3ea5591e59f55cbb4f6b2b7e9363a285ced3':
  Add APIs for obtaining themed Drawable from Theme, Context

10 years agoAdd APIs for obtaining themed Drawable from Theme, Context
Alan Viverette [Tue, 4 Feb 2014 02:40:20 +0000 (18:40 -0800)]
Add APIs for obtaining themed Drawable from Theme, Context

BUG: 12611005
Change-Id: Ic0057be4e4c2d0c61ce02a019b3f7d0625e3a016

10 years agoam 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools...
Scott Main [Tue, 4 Feb 2014 02:11:48 +0000 (02:11 +0000)]
am 5ae21db1: am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit '5ae21db11291cca5ea6fe9f8b2b772deca438e5b':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agoClean up RotateDrawable, add getters and setters for XML properties
Alan Viverette [Tue, 4 Feb 2014 02:08:34 +0000 (18:08 -0800)]
Clean up RotateDrawable, add getters and setters for XML properties

Change-Id: I1bb174e981fb6df910fee3a9d596c0249282928c

10 years agoam a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect...
Scott Main [Tue, 4 Feb 2014 02:08:28 +0000 (02:08 +0000)]
am a7f84f3b: am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit 'a7f84f3bd4582ce2124891db14fbc2ac52548cf8':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agoam 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl...
Scott Main [Tue, 4 Feb 2014 02:06:01 +0000 (02:06 +0000)]
am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit '28a828fa198122a13d053eae2e46f18487818e91':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agoam 8cff1a37: Merge "camera3: Update awbRegions tag."
Ruben Brunk [Tue, 4 Feb 2014 02:01:40 +0000 (18:01 -0800)]
am 8cff1a37: Merge "camera3: Update awbRegions tag."

* commit '8cff1a370e8d89c0a977b82cd8730ab791866808':
  camera3: Update awbRegions tag.

10 years agoam 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293
Scott Main [Tue, 4 Feb 2014 02:01:33 +0000 (02:01 +0000)]
am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293

* commit '56783a742458968a6ec5daf4d9e7a72f755f5ce5':
  remove samples page under tools. redirect in separate cl. bug: 12878293

10 years agocamera3: Update maxRegions tag.
Ruben Brunk [Tue, 4 Feb 2014 01:54:24 +0000 (17:54 -0800)]
camera3: Update maxRegions tag.

Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01

10 years agoMerge "camera3: Update awbRegions tag."
Ruben Brunk [Tue, 4 Feb 2014 01:18:07 +0000 (01:18 +0000)]
Merge "camera3: Update awbRegions tag."

10 years agocamera3: Update awbRegions tag.
Ruben Brunk [Tue, 4 Feb 2014 01:14:33 +0000 (17:14 -0800)]
camera3: Update awbRegions tag.

Change-Id: I85053b61fae4e360eff9143afc021ad60971f3b6

10 years agodocs: Added note on multiple build.gradle files. Bug: 12870006
Ricardo Cervera [Tue, 4 Feb 2014 01:08:31 +0000 (17:08 -0800)]
docs: Added note on multiple build.gradle files. Bug: 12870006

Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html

10 years agoremove samples page under tools. redirect in separate cl.
Scott Main [Tue, 4 Feb 2014 01:07:27 +0000 (17:07 -0800)]
remove samples page under tools. redirect in separate cl.
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

10 years agoAdd adb over Wi-Fi
Glenn Kasten [Mon, 3 Feb 2014 22:01:25 +0000 (14:01 -0800)]
Add adb over Wi-Fi

Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941

10 years agoam 01127579: Merge "Remove setFlags()"
Andy McFadden [Tue, 4 Feb 2014 00:42:11 +0000 (16:42 -0800)]
am 01127579: Merge "Remove setFlags()"

* commit '0112757995debe0d4e3527f9f8299380b0561017':
  Remove setFlags()

10 years agoMerge "Remove setFlags()"
Andy McFadden [Tue, 4 Feb 2014 00:39:15 +0000 (00:39 +0000)]
Merge "Remove setFlags()"

10 years agoAdd new RIL commands to read/write NV items and reset NV config.
Jake Hamby [Wed, 15 Jan 2014 21:08:03 +0000 (13:08 -0800)]
Add new RIL commands to read/write NV items and reset NV config.

Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2

10 years agoam 6faecbb8: am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours...
Tim Murray [Mon, 3 Feb 2014 23:33:46 +0000 (15:33 -0800)]
am 6faecbb8: am fd71ddfd: (-s ours) am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."

* commit '6faecbb8d2b9f99d88913a0a7af592e193e8a8ae':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.

10 years agoam 43098617: am 5d331c7c: am b1bec0d9: am 3fb6feac: Merge "Check that bound allocatio...
Tim Murray [Mon, 3 Feb 2014 23:33:43 +0000 (15:33 -0800)]
am 43098617: am 5d331c7c: am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D"

* commit '430986178dfcc46d84bafd8ad39a16eba30844fd':
  Check that bound allocations are 1D