OSDN Git Service

android-x86/frameworks-base.git
10 years agoam fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"
Narayan Kamath [Fri, 31 Jan 2014 12:17:05 +0000 (12:17 +0000)]
am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit 'fa2e16e36d95d5cf0848a28a98ac4566321fc119':
  change Surface constructor arg to 64bit

10 years agoresolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp
Narayan Kamath [Fri, 31 Jan 2014 12:08:17 +0000 (12:08 +0000)]
resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp

Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b

10 years agoam 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."
Nick Kralevich [Fri, 31 Jan 2014 10:26:32 +0000 (10:26 +0000)]
am 3dfa15c4: am db3278ab: Merge "Map SELinux log levels to Android log levels."

* commit '3dfa15c49b4c78cdf3bf1af79e9b307596455708':
  Map SELinux log levels to Android log levels.

10 years agoam 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into...
Scott Main [Thu, 30 Jan 2014 23:25:08 +0000 (23:25 +0000)]
am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs

* commit '40a7e3c425120661c305999f7c2bdd76d3240b7d':
  Revert "add Cast to the sidenav"

10 years agoam 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page...
Scott Main [Thu, 30 Jan 2014 23:25:02 +0000 (23:25 +0000)]
am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs

* commit '04022e50774c02ff0a7757c5464486af021fd108':
  Revert "add google cast feature page"

10 years agoam bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs...
Quddus Chong [Thu, 30 Jan 2014 23:24:54 +0000 (23:24 +0000)]
am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs

* commit 'bcf8faa6c79bde5b9580057238e447165ac9d329':
  Revert "docs: Added API reference docs for GCore Iberico release."

10 years agoMerge "Add proxy as another network." into klp-modular-dev
Hui Lu [Thu, 30 Jan 2014 22:58:48 +0000 (22:58 +0000)]
Merge "Add proxy as another network." into klp-modular-dev

10 years agoAdd proxy as another network.
Hui Lu [Wed, 15 Jan 2014 16:05:36 +0000 (11:05 -0500)]
Add proxy as another network.

Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb

10 years agoam e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
Scott Main [Thu, 30 Jan 2014 22:10:50 +0000 (22:10 +0000)]
am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs

* commit 'e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
  Revert "add Cast to the sidenav"

10 years agoam 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp...
Scott Main [Thu, 30 Jan 2014 22:10:45 +0000 (22:10 +0000)]
am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs

* commit '4b1a317abb56dc90efacf86ccd796643b1f02478':
  Revert "add google cast feature page"

10 years agoam 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:52:15 +0000 (21:52 +0000)]
am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs

* commit '897739f1b7d179cd402fcf907e2ac9751fe44c6d':
  Revert "add Cast to the sidenav"

10 years agoam 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:52:11 +0000 (21:52 +0000)]
am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs

* commit '428ccea5090d3a88d6af898cd90b52df4062101f':
  Revert "add google cast feature page"

10 years agoMerge "Revert "add Cast to the sidenav"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:27:25 +0000 (21:27 +0000)]
Merge "Revert "add Cast to the sidenav"" into klp-docs

10 years agoRevert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 21:27:06 +0000 (21:27 +0000)]
Revert "add Cast to the sidenav"

This reverts commit 3781318fefba28699e7713b231c9591bf29eadac.

Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d

10 years agoMerge "Revert "add google cast feature page"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:24:45 +0000 (21:24 +0000)]
Merge "Revert "add google cast feature page"" into klp-docs

10 years agoRevert "add google cast feature page"
Scott Main [Thu, 30 Jan 2014 21:24:25 +0000 (21:24 +0000)]
Revert "add google cast feature page"

This reverts commit cf010ab9c5df8896c57a722137ac3b4306ef1ca5.

Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684

10 years agoam f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore...
Quddus Chong [Thu, 30 Jan 2014 19:36:07 +0000 (19:36 +0000)]
am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs

* commit 'f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2':
  Revert "docs: Added API reference docs for GCore Iberico release."

10 years agoam 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release...
Quddus Chong [Thu, 30 Jan 2014 19:33:24 +0000 (19:33 +0000)]
am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs

* commit '583e0b2c0e1011406342a0801045a893b75880ca':
  Revert "docs: Added API reference docs for GCore Iberico release."

10 years agoMerge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp...
Quddus Chong [Thu, 30 Jan 2014 19:31:05 +0000 (19:31 +0000)]
Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs

10 years agoRevert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:03:16 +0000 (19:03 +0000)]
Revert "docs: Added API reference docs for GCore Iberico release."

This reverts commit 32993c68fff5cb229c8503ffe0fad06b53189377.

Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316

10 years agoam 500db2fe: am 55330921: am 8b6fa56f: am c1ae12b7: update android studio download...
Scott Main [Thu, 30 Jan 2014 18:12:46 +0000 (18:12 +0000)]
am 500db2fe: am 55330921: am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2

* commit '500db2fed926e50f6fdb60ccb010724143960dd9':
  update android studio download to 0.4.2

10 years agoam 55330921: am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:09:16 +0000 (18:09 +0000)]
am 55330921: am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2

* commit '55330921c93f3ed6f277fed4d98a2133dd3ab47a':
  update android studio download to 0.4.2

10 years agoam 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:06:44 +0000 (18:06 +0000)]
am 8b6fa56f: am c1ae12b7: update android studio download to 0.4.2

* commit '8b6fa56f5cdb66ed1bafb7920ba8299ee8b3034a':
  update android studio download to 0.4.2

10 years agoam c1ae12b7: update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:03:05 +0000 (18:03 +0000)]
am c1ae12b7: update android studio download to 0.4.2

* commit 'c1ae12b7d891ff3598d03f52a0e817876d7921e3':
  update android studio download to 0.4.2

10 years agoupdate android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 16:55:01 +0000 (08:55 -0800)]
update android studio download to 0.4.2

Change-Id: Icf789bb6a2cfb254b25e865e2a60ec4717887afa

10 years agoam ec20f347: am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to...
Scott Main [Thu, 30 Jan 2014 16:51:09 +0000 (16:51 +0000)]
am ec20f347: am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs

* commit 'ec20f347e71f6ca35cd88b747a9b0ba2a81744cd':
  Revert "add warning to all the new iberico API pages about SDK not available yet"

10 years agoam 599bb934: am 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice...
Scott Main [Thu, 30 Jan 2014 16:47:16 +0000 (16:47 +0000)]
am 599bb934: am 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs

* commit '599bb93400d719d2570f8d84bdbc63c9ed4f85d0':
  Revert "add api notice to cast package index"

10 years agoam 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to all the new...
Scott Main [Thu, 30 Jan 2014 16:46:59 +0000 (16:46 +0000)]
am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs

* commit '46cf90878e49f15a94db28366da581e9f11c9a4c':
  Revert "add warning to all the new iberico API pages about SDK not available yet"

10 years agoam 648729ad: am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice...
Scott Main [Thu, 30 Jan 2014 16:43:13 +0000 (16:43 +0000)]
am 648729ad: am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs

* commit '648729adb4c75199d6464c32cf9eb26cffacb680':
  Revert "add api notice to a bunch more files in iberico release"

10 years agoam 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package...
Scott Main [Thu, 30 Jan 2014 16:43:07 +0000 (16:43 +0000)]
am 759c6305: am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs

* commit '759c6305b227fbb22a031b9ac561f8f23ca41a0f':
  Revert "add api notice to cast package index"

10 years agoam e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages...
Scott Main [Thu, 30 Jan 2014 16:42:44 +0000 (16:42 +0000)]
am e49346dc: am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs

* commit 'e49346dcb213cc96f910c798e4aa00688197af9a':
  Revert "add warning to all the new iberico API pages about SDK not available yet"

10 years agoam 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more...
Scott Main [Thu, 30 Jan 2014 16:38:54 +0000 (16:38 +0000)]
am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs

* commit '540306be15f9d15a93ef05db870653d5a5e7bc38':
  Revert "add api notice to a bunch more files in iberico release"

10 years agoam 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into...
Scott Main [Thu, 30 Jan 2014 16:38:46 +0000 (16:38 +0000)]
am 0d9f5b64: am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs

* commit '0d9f5b640c31a5bce699419a93a98acef1471db7':
  Revert "add api notice to cast package index"

10 years agoam eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK...
Scott Main [Thu, 30 Jan 2014 16:38:33 +0000 (16:38 +0000)]
am eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs

* commit 'eb35de00dec9444e0c46ac641a74d058be48d547':
  Revert "add warning to all the new iberico API pages about SDK not available yet"

10 years agoam eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in...
Scott Main [Thu, 30 Jan 2014 16:34:52 +0000 (16:34 +0000)]
am eee01505: am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs

* commit 'eee015057a2abfaef2ac7360a5536605e7d74e05':
  Revert "add api notice to a bunch more files in iberico release"

10 years agoMerge "Revert "add warning to all the new iberico API pages about SDK not available...
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs

10 years agoam e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
am e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs

* commit 'e627eaeebe061e3fc586a78c8837d1b780d0741b':
  Revert "add api notice to cast package index"

10 years agoRevert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:33:50 +0000 (16:33 +0000)]
Revert "add warning to all the new iberico API pages about SDK not available yet"

This reverts commit e724990230d267c13f8f820b5fdbe7c58b25d344.

Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987

10 years agoMerge "Revert "add api notice to cast package index"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:31:44 +0000 (16:31 +0000)]
Merge "Revert "add api notice to cast package index"" into klp-docs

10 years agoam 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release...
Scott Main [Thu, 30 Jan 2014 16:30:26 +0000 (16:30 +0000)]
am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs

* commit '36d7dfb7e816836dbc6039237cadd3382e10d5b2':
  Revert "add api notice to a bunch more files in iberico release"

10 years agoRevert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:28:27 +0000 (16:28 +0000)]
Revert "add api notice to cast package index"

This reverts commit 845bcc6d344765a0ea7cfcf0b4ac398774d06f94.

Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e

10 years agoMerge "Revert "add api notice to a bunch more files in iberico release"" into klp...
Scott Main [Thu, 30 Jan 2014 16:26:21 +0000 (16:26 +0000)]
Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs

10 years agoRevert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:25:38 +0000 (16:25 +0000)]
Revert "add api notice to a bunch more files in iberico release"

This reverts commit c62223a04d15da4240129a9b05ad0be965f08ee4.

Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4

10 years agoam 54190ec8: Merge "change Surface constructor arg to 64bit"
Narayan Kamath [Thu, 30 Jan 2014 10:34:38 +0000 (02:34 -0800)]
am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit

10 years agoMerge "change Surface constructor arg to 64bit"
Narayan Kamath [Thu, 30 Jan 2014 10:31:43 +0000 (10:31 +0000)]
Merge "change Surface constructor arg to 64bit"

10 years agochange Surface constructor arg to 64bit
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
change Surface constructor arg to 64bit

Bug: 12799017
Bug: 12799384

(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)

Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03

10 years agoam c65e0c95: Merge "Fix a few more delegate methods in layoutlib."
Narayan Kamath [Thu, 30 Jan 2014 09:37:41 +0000 (01:37 -0800)]
am c65e0c95: Merge "Fix a few more delegate methods in layoutlib."

* commit 'c65e0c95c855de4505a320b6dcd66df5397c88d5':
  Fix a few more delegate methods in layoutlib.

10 years agoMerge "Fix a few more delegate methods in layoutlib."
Narayan Kamath [Thu, 30 Jan 2014 09:13:17 +0000 (09:13 +0000)]
Merge "Fix a few more delegate methods in layoutlib."

10 years agoam af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snipp...
Adam Koch [Wed, 29 Jan 2014 23:15:16 +0000 (23:15 +0000)]
am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs

* commit 'af5b2d3f2308296a7dec93e4f790fb587cd86197':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659

10 years agoam 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in display...
Adam Koch [Wed, 29 Jan 2014 23:12:52 +0000 (23:12 +0000)]
am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs

* commit '6e1ce75f4c45e91cdc4442cc6c3d823017c7de4d':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659

10 years agoam b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps...
Adam Koch [Wed, 29 Jan 2014 23:09:58 +0000 (23:09 +0000)]
am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs

* commit 'b430d93b058a706be731e45f8c1836d97219a666':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659

10 years agoam cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class...
Adam Koch [Wed, 29 Jan 2014 23:06:46 +0000 (23:06 +0000)]
am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs

* commit 'cb3ea3d47449a669e0d28131cf9254d5476bae73':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659

10 years agoMerge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 1271565...
Adam Koch [Wed, 29 Jan 2014 23:04:02 +0000 (23:04 +0000)]
Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs

10 years agoam db3278ab: Merge "Map SELinux log levels to Android log levels."
Nick Kralevich [Wed, 29 Jan 2014 18:03:53 +0000 (10:03 -0800)]
am db3278ab: Merge "Map SELinux log levels to Android log levels."

* commit 'db3278ab429860161e5baa26f141de95a48de0cb':
  Map SELinux log levels to Android log levels.

10 years agoMerge "Map SELinux log levels to Android log levels."
Nick Kralevich [Wed, 29 Jan 2014 18:00:36 +0000 (18:00 +0000)]
Merge "Map SELinux log levels to Android log levels."

10 years agoMap SELinux log levels to Android log levels.
Stephen Smalley [Wed, 29 Jan 2014 17:55:58 +0000 (12:55 -0500)]
Map SELinux log levels to Android log levels.

Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoam 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow...
John Spurlock [Wed, 29 Jan 2014 15:49:20 +0000 (15:49 +0000)]
am 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

* commit '15c09e1e2f55fbca9ddafa4227ef30a6dbefa664':
  [Navigation bar] Allow "right to left" gesture to launch search panel

10 years agoam 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left...
John Spurlock [Wed, 29 Jan 2014 15:46:30 +0000 (15:46 +0000)]
am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

* commit '0dbcd7d99f37967f2ee7a8fad113df97b6a94fe7':
  [Navigation bar] Allow "right to left" gesture to launch search panel

10 years agoam 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to...
John Spurlock [Wed, 29 Jan 2014 15:42:34 +0000 (15:42 +0000)]
am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

* commit '2d35ba4d4a43036706638ca0e96e5e1a9904d2af':
  [Navigation bar] Allow "right to left" gesture to launch search panel

10 years agoam d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search...
John Spurlock [Wed, 29 Jan 2014 15:40:00 +0000 (07:40 -0800)]
am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

* commit 'd12f4eb8cb986d710aaf98a9d6b8f66803d182d6':
  [Navigation bar] Allow "right to left" gesture to launch search panel

10 years agoam d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long...
Narayan Kamath [Wed, 29 Jan 2014 15:38:42 +0000 (15:38 +0000)]
am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit 'd933edc742dcaf96862b211f4641e4cfd98acef5':
  mNativeCanvas is long, not int.

10 years agoMerge "[Navigation bar] Allow "right to left" gesture to launch search panel"
John Spurlock [Wed, 29 Jan 2014 15:36:40 +0000 (15:36 +0000)]
Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

10 years agoam 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 15:33:48 +0000 (15:33 +0000)]
am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit '9ecada44042c49516d781281bbe0cba4e0af51a2':
  mNativeCanvas is long, not int.

10 years agoam dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 15:29:23 +0000 (15:29 +0000)]
am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit 'dfd4f5232c87c51fe639b594fd210b4073eca42b':
  mNativeCanvas is long, not int.

10 years agoam d228a038: Merge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 15:26:19 +0000 (07:26 -0800)]
am d228a038: Merge "mNativeCanvas is long, not int."

* commit 'd228a03891f60520d517b2a3bc900b008b2da702':
  mNativeCanvas is long, not int.

10 years agoFix a few more delegate methods in layoutlib.
Narayan Kamath [Wed, 29 Jan 2014 15:05:03 +0000 (15:05 +0000)]
Fix a few more delegate methods in layoutlib.

Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848

10 years agoMerge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 15:02:05 +0000 (15:02 +0000)]
Merge "mNativeCanvas is long, not int."

10 years agoam c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for...
Narayan Kamath [Wed, 29 Jan 2014 12:23:45 +0000 (12:23 +0000)]
am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

* commit 'c74f7619e19f4d172fc0bc6220abc917024c45b0':
  AArch64: Use long for pointers in graphics/Interpolator

10 years agoam 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for...
Narayan Kamath [Wed, 29 Jan 2014 12:23:40 +0000 (12:23 +0000)]
am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit '0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
  AArch64: Use long for pointers in SurfaceTexture

10 years agomNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 12:21:32 +0000 (12:21 +0000)]
mNativeCanvas is long, not int.

swapNativeCanvas was asking for an int field.

Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07

10 years agoam cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graph...
Narayan Kamath [Wed, 29 Jan 2014 12:21:21 +0000 (12:21 +0000)]
am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

* commit 'cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
  AArch64: Use long for pointers in graphics/Interpolator

10 years agoam e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in Surfa...
Narayan Kamath [Wed, 29 Jan 2014 12:21:11 +0000 (12:21 +0000)]
am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit 'e4fc5c17c092a77e0647e01e93a6b0e806c27692':
  AArch64: Use long for pointers in SurfaceTexture

10 years agoam 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
Narayan Kamath [Wed, 29 Jan 2014 12:18:31 +0000 (12:18 +0000)]
am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

* commit '7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
  AArch64: Use long for pointers in graphics/Interpolator

10 years agoam 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
Narayan Kamath [Wed, 29 Jan 2014 12:18:27 +0000 (12:18 +0000)]
am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit '74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
  AArch64: Use long for pointers in SurfaceTexture

10 years agoam d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
Narayan Kamath [Wed, 29 Jan 2014 12:14:48 +0000 (04:14 -0800)]
am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

* commit 'd4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3':
  AArch64: Use long for pointers in graphics/Interpolator

10 years agoam 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
Narayan Kamath [Wed, 29 Jan 2014 12:14:44 +0000 (04:14 -0800)]
am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

* commit '887b1ca87941095797a246b2d68ec2626a7cfc43':
  AArch64: Use long for pointers in SurfaceTexture

10 years agoMerge "AArch64: Use long for pointers in graphics/Interpolator"
Narayan Kamath [Wed, 29 Jan 2014 12:12:27 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in graphics/Interpolator"

10 years agoMerge "AArch64: Use long for pointers in SurfaceTexture"
Narayan Kamath [Wed, 29 Jan 2014 12:12:17 +0000 (12:12 +0000)]
Merge "AArch64: Use long for pointers in SurfaceTexture"

10 years agoam eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for...
Narayan Kamath [Wed, 29 Jan 2014 12:12:14 +0000 (12:12 +0000)]
am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"

* commit 'eaae990695df28f00432978c417f7c47752cd6aa':
  AArch64: Use long for pointers in DRM classes

10 years agoam 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM...
Narayan Kamath [Wed, 29 Jan 2014 12:08:57 +0000 (12:08 +0000)]
am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"

* commit '672f3ee33c3e3d76c4b6764fb1dca8c705c159e3':
  AArch64: Use long for pointers in DRM classes

10 years agoam 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
Narayan Kamath [Wed, 29 Jan 2014 12:06:26 +0000 (12:06 +0000)]
am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"

* commit '95ba1eb6243a9b356ec4ac02177076e2427360a3':
  AArch64: Use long for pointers in DRM classes

10 years agoam dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
Narayan Kamath [Wed, 29 Jan 2014 12:03:16 +0000 (04:03 -0800)]
am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"

* commit 'dd6de16aee254497040b32cc330b4637b96685c0':
  AArch64: Use long for pointers in DRM classes

10 years agoMerge "AArch64: Use long for pointers in DRM classes"
Narayan Kamath [Wed, 29 Jan 2014 12:00:27 +0000 (12:00 +0000)]
Merge "AArch64: Use long for pointers in DRM classes"

10 years agoam 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and...
Narayan Kamath [Wed, 29 Jan 2014 10:54:26 +0000 (10:54 +0000)]
am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"

* commit '09d07d0d33d44fc87c02a8f607ecb7b96dbb4145':
  AArch64: Make Binder and Parcel 64-bit compatible

10 years agoam e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64...
Narayan Kamath [Wed, 29 Jan 2014 10:51:51 +0000 (10:51 +0000)]
am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"

* commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
  AArch64: Make Binder and Parcel 64-bit compatible

10 years agoam 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
Narayan Kamath [Wed, 29 Jan 2014 10:48:52 +0000 (10:48 +0000)]
am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"

* commit '9846fb695a3c41aabde4ca0061d583b35f9621d1':
  AArch64: Make Binder and Parcel 64-bit compatible

10 years agoam 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
Narayan Kamath [Wed, 29 Jan 2014 10:45:12 +0000 (02:45 -0800)]
am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"

* commit '50afaefdc09060c7435291bc91aac47295ce2dfd':
  AArch64: Make Binder and Parcel 64-bit compatible

10 years agoMerge "AArch64: Make Binder and Parcel 64-bit compatible"
Narayan Kamath [Wed, 29 Jan 2014 10:43:22 +0000 (10:43 +0000)]
Merge "AArch64: Make Binder and Parcel 64-bit compatible"

10 years agoam 5a0b40d4: am f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast...
Scott Main [Wed, 29 Jan 2014 08:30:07 +0000 (08:30 +0000)]
am 5a0b40d4: am f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs

* commit '5a0b40d4981f5a28ab0d8462b35d817df588acf5':
  add api notice to cast package index

10 years agoam d50aaefd: am 66c82a8a: am 28c42122: am c62223a0: add api notice to a bunch more...
Scott Main [Wed, 29 Jan 2014 08:30:00 +0000 (08:30 +0000)]
am d50aaefd: am 66c82a8a: am 28c42122: am c62223a0: add api notice to a bunch more files in iberico release

* commit 'd50aaefd3ae44072493b6d7fab11976be0c33d53':
  add api notice to a bunch more files in iberico release

10 years agoam f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast package index...
Scott Main [Wed, 29 Jan 2014 08:27:14 +0000 (08:27 +0000)]
am f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs

* commit 'f088add7f25612a0db7e36a4df0f1c5213899697':
  add api notice to cast package index

10 years agoam 66c82a8a: am 28c42122: am c62223a0: add api notice to a bunch more files in iberic...
Scott Main [Wed, 29 Jan 2014 08:27:09 +0000 (08:27 +0000)]
am 66c82a8a: am 28c42122: am c62223a0: add api notice to a bunch more files in iberico release

* commit '66c82a8a8e9323a26504c15d4024f5b7cb0f7279':
  add api notice to a bunch more files in iberico release

10 years agoam 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs
Scott Main [Wed, 29 Jan 2014 08:24:34 +0000 (08:24 +0000)]
am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs

* commit '80cbc73f657cc6ac5db8bb5529918e9e05edc749':
  add api notice to cast package index

10 years agoam 28c42122: am c62223a0: add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:24:28 +0000 (08:24 +0000)]
am 28c42122: am c62223a0: add api notice to a bunch more files in iberico release

* commit '28c4212223a033cc65e5b2d8029527d5cb4b40a9':
  add api notice to a bunch more files in iberico release

10 years agoam e535499e: Merge "add api notice to cast package index" into klp-docs
Scott Main [Wed, 29 Jan 2014 08:18:54 +0000 (08:18 +0000)]
am e535499e: Merge "add api notice to cast package index" into klp-docs

* commit 'e535499ec3ca9a05dd4b3e6e0fbfdadf01b22415':
  add api notice to cast package index

10 years agoam c62223a0: add api notice to a bunch more files in iberico release
Scott Main [Wed, 29 Jan 2014 08:18:47 +0000 (08:18 +0000)]
am c62223a0: add api notice to a bunch more files in iberico release

* commit 'c62223a04d15da4240129a9b05ad0be965f08ee4':
  add api notice to a bunch more files in iberico release

10 years agoMerge "add api notice to cast package index" into klp-docs
Scott Main [Wed, 29 Jan 2014 08:15:11 +0000 (08:15 +0000)]
Merge "add api notice to cast package index" into klp-docs

10 years agoam f81a02a3: am 9cc6eb7b: am da59b9c1: am e7249902: add warning to all the new iberic...
Scott Main [Wed, 29 Jan 2014 08:11:38 +0000 (08:11 +0000)]
am f81a02a3: am 9cc6eb7b: am da59b9c1: am e7249902: add warning to all the new iberico API pages about SDK not available yet

* commit 'f81a02a38f528c9b4878060c5f5f0ced3854f73c':
  add warning to all the new iberico API pages about SDK not available yet

10 years agoam 299cd65e: am c73d1d4a: am c4cba0e9: am 32993c68: docs: Added API reference docs...
quddusc [Wed, 29 Jan 2014 08:11:18 +0000 (08:11 +0000)]
am 299cd65e: am c73d1d4a: am c4cba0e9: am 32993c68: docs: Added API reference docs for GCore Iberico release.

* commit '299cd65eec6d091e3468432bf492c9c702f75037':
  docs: Added API reference docs for GCore Iberico release.

10 years agoam 9cc6eb7b: am da59b9c1: am e7249902: add warning to all the new iberico API pages...
Scott Main [Wed, 29 Jan 2014 08:06:54 +0000 (08:06 +0000)]
am 9cc6eb7b: am da59b9c1: am e7249902: add warning to all the new iberico API pages about SDK not available yet

* commit '9cc6eb7bea43fbeb7bf29766d6ba6c3603427175':
  add warning to all the new iberico API pages about SDK not available yet