Commit Graph

43079 Commits

Author SHA1 Message Date
Derek Sollenberger
425cc668a9 Merge "Refactor HWUI to better handle Canvas DrawFilters." 2014-10-22 15:59:28 +00:00
Alan Viverette
e23ab83731 am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev automerge: c4a12a7
automerge: 36a132c

* commit '36a132c0a0adfd15b20c3e269d7647c050cd84aa':
  Format ListPreference summary with empty string if entry is null
2014-10-22 01:00:03 +00:00
Alan Viverette
36a132c0a0 am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev
automerge: c4a12a7

* commit 'c4a12a7ad0d6eef723b65c256cd77570b2177a28':
  Format ListPreference summary with empty string if entry is null
2014-10-22 00:45:34 +00:00
Alan Viverette
bb852b0b6b Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev 2014-10-22 00:35:29 +00:00
Alan Viverette
13e13ddd4e Format ListPreference summary with empty string if entry is null
Adding serif-monospace and sans-serif-monospace font families bumped
out the previous monospace, which left the summary as %s. Returning
an unformatted summary is never correct, and we should simply return
a summary populated with an empty string.

BUG: 17666124
Change-Id: Ic22dc5dc87d9ba3ad6f6b92ee059f5c98cbf103a
2014-10-21 17:05:07 -07:00
Adam Powell
3ce4c0712d am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev
automerge: 639e318

* commit '639e3181e0c3bb7fae5e05ef9edde729a67e2ac5':
  Intent chooser callback
2014-10-21 23:38:48 +00:00
John Reck
7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas
2014-10-21 23:34:46 +00:00
Deepanshu Gupta
eea621810c Merge "Add Optimized Line breaking to LayoutLib" 2014-10-21 22:44:38 +00:00
Deepanshu Gupta
7053919a3a Add Optimized Line breaking to LayoutLib
Change-Id: I308a7d07d98ddd7747f16e06bcffcfd14d667534
2014-10-21 15:43:53 -07:00
Adam Powell
639e3181e0 am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev
* commit 'e055c95b77a3610452f31d2303fa35bf171acf0e':
  Intent chooser callback
2014-10-21 21:49:55 +00:00
Adam Powell
054e8be5e0 Merge "Intent chooser callback" into lmp-mr1-dev 2014-10-21 21:41:19 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
2014-10-21 21:39:36 +00:00
John Reck
bf463af2a5 Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 2014-10-21 20:59:53 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
2014-10-21 13:23:56 -07:00
Adam Powell
0b3c11260a Intent chooser callback
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
2014-10-21 12:17:50 -07:00
John Spurlock
2e594f1eb5 am 184c46a9: am c6639c26: am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev
* commit '184c46a93d2ee232db6d541c1966b53a858b5ad7':
  Settings: Make SeekBarVolumizer more null-resilient.
2014-10-21 18:53:43 +00:00
John Spurlock
184c46a93d am c6639c26: am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev
* commit 'c6639c26ed6fddafd73210e535b0bb359a8192c0':
  Settings: Make SeekBarVolumizer more null-resilient.
2014-10-21 18:48:18 +00:00
John Spurlock
cc8b3e8d4e Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 2014-10-21 18:39:20 +00:00
Alan Viverette
c93ca4506b am c74ca441: am a74b9432: am 3d52809b: Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev
* commit 'c74ca4415eddf821d9cf67a552b290fdb1bf1d94':
  Prevent excessive accessibility announcements in TimePicker
2014-10-21 18:38:58 +00:00
Alan Viverette
c74ca4415e am a74b9432: am 3d52809b: Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev
* commit 'a74b9432e893acf8989fa9e2f553c0bdd3cc48d8':
  Prevent excessive accessibility announcements in TimePicker
2014-10-21 18:29:08 +00:00
John Spurlock
735f9ebc18 Settings: Make SeekBarVolumizer more null-resilient.
Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.

Bug: 18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
2014-10-21 14:23:24 -04:00
Alan Viverette
3d52809bad Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 2014-10-21 18:16:25 +00:00
Wei Wang
c071e2775f am a4f81468: am 1217c2b2: am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit 'a4f814682ff30a19ba80555bdc809d14bdb24bca':
  Remove spammy log information for BLE scan.
2014-10-20 22:00:12 +00:00
Wei Wang
a4f814682f am 1217c2b2: am 2959231c: am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit '1217c2b2dbe7b4273a7c08ac55b417270ee20b78':
  Remove spammy log information for BLE scan.
2014-10-20 21:54:59 +00:00
Wei Wang
2959231c78 am 33bb6c2d: Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev
* commit '33bb6c2d3ca798c8275694d0fe700e9fb1fefe99':
  Remove spammy log information for BLE scan.
2014-10-20 21:46:08 +00:00
Wei Wang
33bb6c2d3c Merge "Remove spammy log information for BLE scan." into lmp-sprout-dev 2014-10-20 21:41:29 +00:00
Alan Viverette
05b07c56b5 am a14344de: am 49870a1b: am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
* commit 'a14344de9b4891301fcb1a57055e20e29f25075a':
  Only request layout when removeView() actually removes a view
2014-10-20 19:18:40 +00:00
Alan Viverette
a14344de9b am 49870a1b: am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev
* commit '49870a1b6460dc006a20fc11e1d0d67248a87be4':
  Only request layout when removeView() actually removes a view
2014-10-20 19:13:30 +00:00
Alan Viverette
e28cd1a276 Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 2014-10-20 19:00:36 +00:00
Adrian Roos
733ad97c38 am 4e2c2988: am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
* commit '4e2c29887616596e922e2b5fc5ac4929b3654f6c':
  Retire RecentApplicationsDialog
2014-10-20 13:20:37 +00:00
Adrian Roos
4e2c298876 am 2f6fd874: am 5f978bfa: Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev
* commit '2f6fd874510cd333f7fc0b08e146d5d069fa2013':
  Retire RecentApplicationsDialog
2014-10-20 13:15:40 +00:00
Adrian Roos
5f978bfa09 Merge "Retire RecentApplicationsDialog" into lmp-mr1-dev 2014-10-20 13:04:09 +00:00
Neil Fuller
17debef4c5 am 1f2ad9eb: am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '1f2ad9eb7417045c0a08b49a3bdf48600627c57e':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:23:19 +00:00
Neil Fuller
1f2ad9eb74 am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit 'dfcf065505a12aa358af5cd2607fd355eee964c4':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:16:29 +00:00
Neil Fuller
dfcf065505 am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"
* commit '09fd5a1873fa1ab51f4e428b1b909fea35091a51':
  Replacing FloatMath native implementation with calls to Math
2014-10-20 10:10:34 +00:00
Neil Fuller
09fd5a1873 Merge "Replacing FloatMath native implementation with calls to Math" 2014-10-20 10:08:11 +00:00
Yuncheol Heo
265a4fc622 am 26ea56b3: am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed.
* commit '26ea56b3c5dc746e4f292f909d08b4d8f80f0d2a':
  CEC: Add a callback for vendor when HDMI control setting is changed.
2014-10-20 09:24:21 +00:00
Yuncheol Heo
26ea56b3c5 am 5814bf1c: am 0608b932: CEC: Add a callback for vendor when HDMI control setting is changed.
* commit '5814bf1c7bc4b8abed781c1667305d843e7079fb':
  CEC: Add a callback for vendor when HDMI control setting is changed.
2014-10-20 09:19:49 +00:00
Nick Kralevich
7b3db39aa4 Replacing FloatMath native implementation with calls to Math
On modern versions of Android running in AOT mode
FloatMath is slower than Math. Calls to Math.sqrt(),
etc. are replaced by intrinsics which can be as small
as a single CPU opcode.

When running in interpreted mode the new
implementation is unfortunately slower, but I'm
judging this acceptable and likely to be improved
over time. This change saves a small amount of native
code.

Example timings:

Mako AOSP AOT:

Method: Original / New / Direct call to Math
ceil: 596ns / 146.ns / 111ns
sqrt: 694ns / 56ns / 25ns

Mako AOSP interpreted:

Method: Original / New / Direct call to Math
ceil: 1900ns / 2307ns / 1485ns
sqrt: 1998ns / 2603ns / 1788ns

Other calls Mako AOT:

Method: Original / New
cos: 635ns / 270ns
exp: 566ns / 324ns
floor: 604ns / 150ns
hypot: 631ns / 232ns
pow: 936ns / 643ns
sin: 641ns / 299ns

The advice to use Math directly, in preference to
FloatMath, is still good. FloatMath will be deprecated
separately.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: If07fcbd78543d13bc6d75f9743f999860e8d58d7
2014-10-20 09:24:11 +01:00
Yuncheol Heo
0608b9328b CEC: Add a callback for vendor when HDMI control setting is changed.
- removed unregisterContentObserver() to reactivate the service later.
- added the parameter destAddress to onReceived() callback to
  distinguish whether the message is broadcast or not.

Bug: 17962624
Change-Id: I552d14661583f63bb66b07866092f972b259b15a
2014-10-20 16:47:24 +09:00
Jinsuk Kim
4e222e0b23 am dcc80043: am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev automerge: f5e6935
* commit 'dcc8004377f868142561986b0339ef6dfe68438a':
  CEC: add getDeviceList()
2014-10-20 03:46:24 +00:00
Jinsuk Kim
dcc8004377 am 7a78e578: Merge "CEC: add getDeviceList()" into lmp-mr1-dev
automerge: f5e6935

* commit 'f5e693510153ecf855d7d2d807bd36b1bd9be28c':
  CEC: add getDeviceList()
2014-10-20 03:28:32 +00:00
Jinsuk Kim
7a78e578d7 Merge "CEC: add getDeviceList()" into lmp-mr1-dev 2014-10-20 03:02:44 +00:00
Jinsuk Kim
bdf27fbf74 CEC: add getDeviceList()
Returns the list of all the connected CEC device information. This is
different from getInputDevices() which returns devices of source type only.

For this, turned the local device address list to unmodifiable so that it can
be used by any threads.

Now respects the device type info passed through <Report Physical Address>
rather than always defaulting to the one from HdmiUtil.getTypeFromAddress().
This ensures future compatibility when a device of reserved logical address
comes with a specific type.

Bug: 18046603
Change-Id: I5f7d5e31706efba1ad5dcf4bcfd4ffc918d1d940
2014-10-20 11:32:47 +09:00
Elliott Hughes
961e3d3922 am 87036756: am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '870367567a1665dbb109e030f4a2828b60b454db':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 21:00:30 +00:00
Elliott Hughes
870367567a am 84e6d466: am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '84e6d466edc2aba711f90431a1cd209d11c0e70d':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:54:05 +00:00
Elliott Hughes
84e6d466ed am 4cd671e4: Merge "Revert "Replacing FloatMath native implementation with calls to Math""
* commit '4cd671e4d27befdd576fa86051956c3cafad6808':
  Revert "Replacing FloatMath native implementation with calls to Math"
2014-10-18 20:48:03 +00:00
Elliott Hughes
4cd671e4d2 Merge "Revert "Replacing FloatMath native implementation with calls to Math"" 2014-10-18 20:43:07 +00:00
Elliott Hughes
b3b68d0333 Revert "Replacing FloatMath native implementation with calls to Math"
This reverts commit 32b88b48da.

Change-Id: I40ea17f3a68f2b53eb013aebd3ba1becdc724f94
2014-10-18 20:41:27 +00:00
Nick Kralevich
bf96737e58 Switch from FloatMath -> Math and Math.hypot where possible
Somehow the change at
https://android-review.googlesource.com/#/c/109481/1/core/java/android/util/Spline.java
isn't in master, which seems to be causing a boot failure.

  07-28 07:44:51.338   771   771 E art     : No implementation found for float android.util.FloatMath.hypot(float, float) (tried Java_android_util_FloatMath_hypot and Java_android_util_FloatMath_hypot__FF)
  07-28 07:44:51.338   771   771 W SystemServer: ***********************************************
  07-28 07:44:51.339   771   771 F SystemServer: BOOT FAILURE making Power Manager Service ready
  07-28 07:44:51.339   771   771 F SystemServer: java.lang.UnsatisfiedLinkError: No implementation found for float android.util.FloatMath.hypot(float, float) (tried Java_android_util_FloatMath_hypot and Java_android_util_FloatMath_hypot__FF)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.FloatMath.hypot(Native Method)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.Spline$MonotoneCubicSpline.<init>(Spline.java:168)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.Spline.createMonotoneCubicSpline(Spline.java:72)
  07-28 07:44:51.339   771   771 F SystemServer: 	at android.util.Spline.createSpline(Spline.java:47)
  07-28 07:44:51.339   771   771 F SystemServer: 	at com.android.server.display.DisplayPowerController.createAutoBrightnessSpline(DisplayPowerController.java:1100)

Change-Id: Ic6a85d4f9125b921fa4f307e9d5723c09104ca4d
2014-10-18 13:29:04 -07:00