OSDN Git Service

android-x86/frameworks-base.git
10 years agoRevert "Add Path trimming."
George Mount [Fri, 31 Jan 2014 00:56:09 +0000 (00:56 +0000)]
Revert "Add Path trimming."

Bug 12489442
This reverts commit 7fe03a267e6edb65142444765ce29ad5ff126052.

Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3

10 years agoam 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails...
Zhijun He [Fri, 31 Jan 2014 15:12:38 +0000 (15:12 +0000)]
am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"

* commit '4f840dd16db41a2d4442667193d57260f84af04a':
  Release locked buffer when it fails to acquire graphics buffer

10 years agoam dfd1aa43: resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp
Narayan Kamath [Fri, 31 Jan 2014 15:12:34 +0000 (15:12 +0000)]
am dfd1aa43: resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

* commit 'dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default

10 years agoam 5cdbac1e: (-s ours) am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for...
Narayan Kamath [Fri, 31 Jan 2014 15:12:30 +0000 (15:12 +0000)]
am 5cdbac1e: (-s ours) am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

* commit '5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72':
  AArch64: Use of long for pointers in PropertyValuesHolder

10 years agoam 133c9649: am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"
Narayan Kamath [Fri, 31 Jan 2014 15:06:21 +0000 (15:06 +0000)]
am 133c9649: am fa2e16e3: am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit '133c9649c3c83e6ccefa4f46c162ddb3f55269d0':
  change Surface constructor arg to 64bit

10 years agoam 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp
Narayan Kamath [Fri, 31 Jan 2014 15:06:17 +0000 (15:06 +0000)]
am 98ac6c79: resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp

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

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

* commit '643be3bab19a6305e776721854b293928bf2bfaa':
  Map SELinux log levels to Android log levels.

10 years agoMerge "Change ResourceType cookies to int32_t."
Narayan Kamath [Fri, 31 Jan 2014 13:46:08 +0000 (13:46 +0000)]
Merge "Change ResourceType cookies to int32_t."

10 years agoam 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graph...
Zhijun He [Fri, 31 Jan 2014 13:00:35 +0000 (13:00 +0000)]
am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"

* commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db':
  Release locked buffer when it fails to acquire graphics buffer

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

Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2

10 years agoam 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesH...
Narayan Kamath [Fri, 31 Jan 2014 12:17:09 +0000 (12:17 +0000)]
am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder

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 53959634: am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the...
Scott Main [Fri, 31 Jan 2014 08:12:30 +0000 (08:12 +0000)]
am 53959634: am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs

* commit '53959634b35ab75ef40ac4514d50bae2de9425ac':
  Revert "add Cast to the sidenav"

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

* commit 'a749593dd64f6d8f8d5d5e6addd16699258e9130':
  Revert "add google cast feature page"

10 years agoam 7ce575a5: am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API...
Quddus Chong [Fri, 31 Jan 2014 08:12:20 +0000 (08:12 +0000)]
am 7ce575a5: am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs

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

10 years agoam 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
Hui Lu [Fri, 31 Jan 2014 08:11:57 +0000 (08:11 +0000)]
am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev

* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
  Add proxy as another network.

10 years agoMerge "Add PathInterpolator to interpolate along a Path."
George Mount [Fri, 31 Jan 2014 00:53:19 +0000 (00:53 +0000)]
Merge "Add PathInterpolator to interpolate along a Path."

10 years agoAdd PathInterpolator to interpolate along a Path.
George Mount [Thu, 10 Oct 2013 22:28:17 +0000 (15:28 -0700)]
Add PathInterpolator to interpolate along a Path.

Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7

10 years agoMerge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Fri, 31 Jan 2014 00:21:15 +0000 (00:21 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"

10 years agoframeworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default

(cherry picked from commit c6c633608ad4cd77ed21227b0bdb11eb79797c31)

Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4

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 "Fix nano vs. millis"
John Reck [Thu, 30 Jan 2014 23:16:09 +0000 (23:16 +0000)]
Merge "Fix nano vs. millis"

10 years agoam 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
Zhijun He [Thu, 30 Jan 2014 23:03:30 +0000 (15:03 -0800)]
am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"

* commit '0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
  Release locked buffer when it fails to acquire graphics buffer

10 years agoMerge "Release locked buffer when it fails to acquire graphics buffer"
Zhijun He [Thu, 30 Jan 2014 23:01:20 +0000 (23:01 +0000)]
Merge "Release locked buffer when it fails to acquire graphics buffer"

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 agoMerge "Make public but hide OnPreferenceTreeClickListener"
Fabrice Di Meglio [Thu, 30 Jan 2014 22:17:16 +0000 (22:17 +0000)]
Merge "Make public but hide OnPreferenceTreeClickListener"

10 years agoMerge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarVie...
Fabrice Di Meglio [Thu, 30 Jan 2014 22:15:07 +0000 (22:15 +0000)]
Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)"

10 years agoam 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new...
Brian Carlstrom [Thu, 30 Jan 2014 22:11:02 +0000 (14:11 -0800)]
am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '3038046b23540ccf4ca80f181386a77cf64d5e27':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default

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 "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:50:57 +0000 (21:50 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"

10 years agoMerge "Formatting fix"
Patrick Tjin [Thu, 30 Jan 2014 21:46:52 +0000 (21:46 +0000)]
Merge "Formatting fix"

10 years agoMerge "Allow "opaque" flag to be updated"
Andy McFadden [Thu, 30 Jan 2014 21:41:38 +0000 (21:41 +0000)]
Merge "Allow "opaque" flag to be updated"

10 years agoFormatting fix
Patrick Tjin [Thu, 30 Jan 2014 21:28:46 +0000 (13:28 -0800)]
Formatting fix

Remove whitespace from end of Sync Status table

Change-Id: I5b0bf3380e0c67c769ec9c334f1374713c94aa94

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 agoframeworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default

Bug: 12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4

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 agoMerge "Redact public version of screenshot notifications."
Dan Sandler [Thu, 30 Jan 2014 18:33:58 +0000 (18:33 +0000)]
Merge "Redact public version of screenshot notifications."

10 years agoMerge "SystemUI support for notification visibility."
Dan Sandler [Thu, 30 Jan 2014 18:33:47 +0000 (18:33 +0000)]
Merge "SystemUI support for notification visibility."

10 years agoMerge "Notification visibility APIs."
Dan Sandler [Thu, 30 Jan 2014 18:33:41 +0000 (18:33 +0000)]
Merge "Notification visibility APIs."

10 years agoRedact public version of screenshot notifications.
Dan Sandler [Thu, 30 Jan 2014 16:14:07 +0000 (11:14 -0500)]
Redact public version of screenshot notifications.

It's OK to reveal that a screenshot has been taken, but the public
version of this notification no longer shows the actual screenshot
image itself (in case it was taken before the device was locked
and therefore might contain sensitive information).

Change-Id: I5ba0b64023810ece0cea56ba457968fbde4b0cbe

10 years agoSystemUI support for notification visibility.
Dan Sandler [Thu, 23 Jan 2014 20:11:54 +0000 (15:11 -0500)]
SystemUI support for notification visibility.

In this implementation, DISABLE_NOTIFICATION_TICKER (which was never
really used on its own and can be safely subsumed by
DISABLE_NOTIFICATION_ICONS) is now DISABLE_PRIVATE_NOTIFICATIONS;
when this SystemUI bit is set by the keyguard, SystemUI knows to switch
its presentation into "public" mode, in which
VISIBILITY_PRIVATE notifications are replaced with their
publicVersion's contentView (or a placeholder view,
synthesized by SystemUI, that leaks no additional
information about the notification). VISIBILITY_SECRET
notifications are suppressed altogether in this mode.

This behavior is enabled but not activated by default. To
turn it on, run:

  $ adb shell settings put secure lock_screen_allow_notifications 1

and restart SystemUI.

Change-Id: Id660bef7737580e16a83f60567c22b53ee81c602

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

* commit '84dabc75daf3045cc5d59971112589d32972f3b1':
  update android studio download to 0.4.2

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 agoNotification visibility APIs.
Dan Sandler [Sun, 22 Dec 2013 05:33:41 +0000 (23:33 -0600)]
Notification visibility APIs.

The new visibility property allows an application to signal
to SystemUI whether a notification's contents are safe to
show in "public" situations, i.e. outside of a secure
lockscreen, or whether they should be treated as "private"
(where only the icon is revealed).

Apps that post information that includes no personal or
sensitive information (e.g. a weather alert) can use
VISIBILITY_PUBLIC to allow users to see (and potentially
even dismiss) this kind of notification without unlocking
their devices.

The historical treatment of Android notifications
corresponds to VISIBILITY_PRIVATE, which is the default
visibility setting for all notifications, including apps
that are not aware of this API.

VISIBILITY_PRIVATE notifications may optionally specify a
publicVersion, which is a whole other Notification object
whose contentView will be shown in public contexts. This
allows an app to provide a "redacted" public version of its
notification that is more useful than the system-supplied
version (showing just the icon and app name) but still
conceals private information. For example, a messaging app
that today posts a Notification including the sender and
contents of each message could additionally specify a
publicVersion that says, simply, "N new messages".

There's also VISIBILITY_SECRET for notifications that should
be totally concealed (that is, no icon) in public contexts.
To reveal any hint of this kind of notification would
require the user to unlock the device.

Change-Id: I1552db36c469954d27d3c92ba21ac5c703d47ae1

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 959c5d5e: am ec20f347: am 46cf9087: am e49346dc: am eb35de00: Merge "Revert "add...
Scott Main [Thu, 30 Jan 2014 16:55:04 +0000 (16:55 +0000)]
am 959c5d5e: 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 '959c5d5ef9be28a054b6dd61a9f660dfe967351b':
  Revert "add warning to all the new iberico API pages about SDK not available yet"

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

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

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 cbc8a872: am 648729ad: am 540306be: am eee01505: am 36d7dfb7: Merge "Revert "add...
Scott Main [Thu, 30 Jan 2014 16:50:53 +0000 (16:50 +0000)]
am cbc8a872: 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 'cbc8a872cc7bbf3bb6d64b262b070e6321644bcc':
  Revert "add api notice to a bunch more files in iberico release"

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 agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 30 Jan 2014 16:43:31 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 30 Jan 2014 16:43:29 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 30 Jan 2014 16:43:24 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE"

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 agoMerge "Don't set suggested wallpaper dimensions in default wallpaper cropper"
Michael Jurka [Thu, 30 Jan 2014 14:34:55 +0000 (14:34 +0000)]
Merge "Don't set suggested wallpaper dimensions in default wallpaper cropper"

10 years agoAdd public SynthesisRequestV2 constructor.
Przemyslaw Szczepaniak [Fri, 22 Nov 2013 13:08:01 +0000 (13:08 +0000)]
Add public SynthesisRequestV2 constructor.

While implementing the new TTS API, I found out that it's very difficult
to create an SynthesisRequestV2 instance for testing purposes - it's
a final class, with no publicly visible constructors.

Bug: 8259486
Change-Id: I88b84fd8ad1ac6960f3932863ca758657f9547ff

10 years agoAllow clients to extend the TTS UtteranceId class.
Przemyslaw Szczepaniak [Wed, 29 Jan 2014 15:20:06 +0000 (15:20 +0000)]
Allow clients to extend the TTS UtteranceId class.

This change allows TTS clients to create (and use) classes derived from the
UtteranceId class. This allows to attach a custom data and methods that
can be reached later in callbacks that take the UtteranceId instance as
parameter.

Also, since we can't depend on the identityHashCode results being unique,
this change adds AtomicInteger to generate unique identifiers for UtteranceId
instances.

Bug: 8259486
Change-Id: Id1e9eabc890ec585a7f8570fd20e287dcda9a11d

10 years agoam ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
Narayan Kamath [Thu, 30 Jan 2014 10:39:21 +0000 (02:39 -0800)]
am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

* commit 'ab71f8b68fee0f2a4f2049c4345b5334948c9df9':
  AArch64: Use of long for pointers in PropertyValuesHolder

10 years agoMerge "AArch64: Use of long for pointers in PropertyValuesHolder"
Narayan Kamath [Thu, 30 Jan 2014 10:37:12 +0000 (10:37 +0000)]
Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

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 agoFix nano vs. millis
John Reck [Thu, 30 Jan 2014 02:31:51 +0000 (18:31 -0800)]
Fix nano vs. millis

Change-Id: I54f752bb7faab5fa66c36252c9f7cf8f5c9939c9

10 years agoFix build
Deepanshu Gupta [Thu, 30 Jan 2014 03:13:55 +0000 (19:13 -0800)]
Fix build

Change-Id: Ifcbf44bc310daee4410ccc6ddf6bdc44565e20da

10 years agoMerge "Fix native method signatures"
Deepanshu Gupta [Thu, 30 Jan 2014 02:47:53 +0000 (02:47 +0000)]
Merge "Fix native method signatures"

10 years agoMerge "Manual merge of changes from klp-dev"
Deepanshu Gupta [Thu, 30 Jan 2014 02:47:16 +0000 (02:47 +0000)]
Merge "Manual merge of changes from klp-dev"