102538 Commits

Author SHA1 Message Date
Jeff Tinker
1e0f36cffd Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev 2013-04-05 01:16:23 +00:00
Nick Kralevich
80fdc9624e Merge "Error on conflicting <uses-permission>" into jb-mr2-dev 2013-04-05 00:24:40 +00:00
Nick Kralevich
745a42bbb9 Merge "aapt: add support for optional uses-permission" into jb-mr2-dev 2013-04-05 00:23:11 +00:00
Nick Kralevich
73f2d3c79e Error on conflicting <uses-permission>
Don't install packages where we have multiple, conflicting
<uses-permission> lines for the same permission.

For example, a package which contains:

<uses-permission android:name="android.permission.INTERNET" android:required="false" />
<uses-permission android:name="android.permission.INTERNET" android:required="true" />

will now fail to install.

In addition, this change slightly refactors the code, and creates a new
parseUsesPermission() method.

Change-Id: I0f4bb8b51dc4a0c5b73458a70f706e19829275d2
2013-04-04 17:12:00 -07:00
Romain Guy
a151ef8c66 Merge "First OpenGL ES 3.0 based optimization" into jb-mr2-dev 2013-04-04 22:51:38 +00:00
Romain Guy
faec826bd6 Merge "Reduce the size of dirty invalidates" into jb-mr2-dev 2013-04-04 22:47:49 +00:00
Romain Guy
e55945e219 Reduce the size of dirty invalidates
Remove remnants from times long gone. We don't need to redraw the
union of the previous frame's dirty region and the new dirty
region.

Change-Id: I9fb96f99a6a72c2233f9ca563cf6432a42b2b65b
2013-04-04 15:29:09 -07:00
Chris Craik
de4f8c3872 Merge "Traverse layers in update order" into jb-mr2-dev 2013-04-04 22:27:00 +00:00
Chris Craik
1206b9bba9 Traverse layers in update order
bug:8540150

Layers now require traversal in update order, as it will be child
first, then parent for layer-in-layer

Fixes issue with deferred layer playback not flushing in order, and
thus child not painting before parent

Also fixes DisplayList to only be cleared after flush in deferred list

Change-Id: I2f284d00079cdb20798aeef6a1c94e823940db40
2013-04-04 14:55:43 -07:00
Fabrice Di Meglio
5a78b1b20d Merge "Fix for bug #8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev 2013-04-04 21:16:43 +00:00
Nick Kralevich
b2c3aa8e32 Merge "PackageParser: ignore <uses-permission> android:required on older apps" into jb-mr2-dev 2013-04-04 20:27:32 +00:00
Nick Kralevich
38f130e19a PackageParser: ignore <uses-permission> android:required on older apps
Don't honor <uses-permission android:required="false"> on older apps.
Lots of apps in the wild are improperly using this, and we don't
want to break them.

Bug: 8528162
Change-Id: I6e0a10bc9feac58d13ef624239c6b91e9fc34590
2013-04-04 13:19:10 -07:00
Romain Guy
0908764b2b First OpenGL ES 3.0 based optimization
This change uses a new OpenGL ES 3.0 feature to upload less data when
the font cache needs to be update. This can result in significant
performance improvements on device with large textures or with locales
that use a lot of glyphs (CJK for instance.)

This change also fixes various unpack alignment issues. The unpack
alignment, as well as the unpack row length, is not texture specific
but a global state that affect all glTex/SubImage2D calls. Some of
them were missing the appropriate glPixelStorei() call. This could
result in corrupted textures.

Change-Id: Iefb429d4d0d0b4e0faeadf27daafee6d30a21d85
2013-04-04 12:27:54 -07:00
Chet Haase
77d94957d7 Merge "Adding small animation features" into jb-mr2-dev 2013-04-04 18:24:46 +00:00
Chet Haase
b989502e5c Adding small animation features
RectEvaluator is useful when animating object bounds.
The other change is a hidden API that allows temporary suspension
of layout, useful for animations which need to animate view bounds
without conflicting with layout passes that might happen in the middle
of the animation.

Change-Id: I3dc08cb6ec455dfa3409e825506b218d3ea63d7a
2013-04-04 11:00:07 -07:00
Adam Powell
728827ff47 Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev 2013-04-04 17:58:27 +00:00
Romain Guy
eaadd123a7 Merge "Add internal API to query GL version number" into jb-mr2-dev 2013-04-04 17:53:06 +00:00
Adam Powell
8c16aa9fa2 Uphold common ordering expectations around action bar Home/Up dispatch
Some apps aren't particularly happy if a stray key event is dispatched
to a newly created window before its menu is prepared, causing the
action bar's Home/Up event to be dispatched. Ignore these clicks on
the Home/Up button before the menu goes through its initial prepare
step.

Note that it is still possible (and valid!) for Home/Up to be
dispatched even if the app chose to return false from
onCreateOptionsMenu or similar.

Bug 7085070

Change-Id: If4b7d5f8c5a08ce8a094f1919347604d78ddedfb
2013-04-04 10:51:09 -07:00
Romain Guy
df1dc28ba0 Add internal API to query GL version number
Change-Id: Idc02efc237b8e97445a9bab05c291bf193c7f279
2013-04-04 10:50:48 -07:00
Victoria Lease
8712e4cc4a Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-dev 2013-04-04 14:40:52 +00:00
Victoria Lease
430fc97e7e use libphonenumber for Linkify.PHONE_NUMBER
This commit replaces a regex pattern match for Linkify.PHONE_NUMBER
with a call to libphonenumber's PhoneNumberUtil.findNumbers().

Bug: 5533245
Change-Id: I0e0563b241fb62e77d7f49e4a8484c6b0685dd8f
2013-04-04 07:38:24 -07:00
Jeff Sharkey
9059d3775a Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev 2013-04-04 06:09:35 +00:00
Ying Wang
0fa30372c7 Fix doc build.
Change-Id: I954a45866d968b0571040ba99cc93b818d02aeb5
2013-04-03 22:57:31 -07:00
Fabrice Di Meglio
787e662c0d Fix for bug #8146846 Phone App should be mirrored for RTL languages
- add RTL version of quickcontact badge overlay

Change-Id: I007d0dae9ceec9c42684e45a735ea6b06aa6f9a0
2013-04-03 21:01:58 -07:00
Matthew Xie
26cd4d658f Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev 2013-04-04 03:16:40 +00:00
kmccormick
fb9a9713f4 am 614c155f: am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '614c155fc6e4c3e83b152398df0e628d7a7f4051':
  Doc update: clean up text and code snippets
2013-04-03 18:45:29 -07:00
kmccormick
614c155fc6 am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit 'f64ad28f6b3c56c054f938680c58b69cf7237b2c':
  Doc update: clean up text and code snippets
2013-04-03 18:41:54 -07:00
kmccormick
f64ad28f6b am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit '15ebf622de39e1a8c7d8855f5b4ede35039a2b2b':
  Doc update: clean up text and code snippets
2013-04-03 18:38:05 -07:00
kmccormick
15ebf622de am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit 'f614d53664b78f0fb386bbea93f4513c92786ff1':
  Doc update: clean up text and code snippets
2013-04-03 18:35:46 -07:00
kmccormick
f614d53664 am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs
* commit 'e4922f28b4d3c1f6ff166a6e5d5849c8533562ea':
  Doc update: clean up text and code snippets
2013-04-03 18:32:36 -07:00
kmccormick
e4922f28b4 Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs 2013-04-04 01:28:53 +00:00
kmccormick
fad80f7e53 Doc update: clean up text and code snippets
"Bug: 6942838"

Change-Id: I496cbcd4b6236b5bc8a41484890f96721ba598a0
2013-04-03 18:26:30 -07:00
Matthew Xie
33ec9840c7 Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
Change name of BluetoothDevice#connectGattServer to BluetoothDevice#connectGatt
Add BluetoothGatt#getDevice to retrieve device from BluetoothGatt
Add BluetoothGatt#connect() to reconnect back to the server.
Make BluetoothGatt#close() public to clean up/unregister callback
Add BluetoothDevice.getType() to return int of
bug 8529188

Change-Id: Iebd9ac68cc7a64c43972e617dd3068f66c8ea0b2
2013-04-03 18:20:13 -07:00
kmccormick
9b9c895774 am b2961bd6: am 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit 'b2961bd6833697baac52888765fe8518133f489e':
  Doc update: typo in widget design doc
2013-04-03 18:16:32 -07:00
kmccormick
b2961bd683 am 8f662f12: am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '8f662f125edf393943fa7cceaf4758aae0534841':
  Doc update: typo in widget design doc
2013-04-03 18:12:48 -07:00
kmccormick
8f662f125e am 026625ff: am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '026625ffd5f256997f5bda87d39afe10152f5a9e':
  Doc update: typo in widget design doc
2013-04-03 18:08:32 -07:00
kmccormick
e10b600d5d am 984f94ee: am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '984f94ee4c4ef0196d9b2c149d0a42f20b72bebf':
  Doc update: unterminated code tags
2013-04-03 18:06:40 -07:00
kmccormick
026625ffd5 am 72146342: am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit '72146342cbe9ac1e1efffe90fa64d7f4026cf359':
  Doc update: typo in widget design doc
2013-04-03 18:06:02 -07:00
kmccormick
72146342cb am e40b0810: Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs
* commit 'e40b0810d9200c3de7e75ed3d311c8697bccd0a3':
  Doc update: typo in widget design doc
2013-04-03 18:03:31 -07:00
kmccormick
984f94ee4c am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit 'f29ca256a4340a3d550d2c4a39a2e6a29a3ce850':
  Doc update: unterminated code tags
2013-04-03 18:03:00 -07:00
kmccormick
f29ca256a4 am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
  Doc update: unterminated code tags
2013-04-03 18:00:11 -07:00
kmccormick
e40b0810d9 Merge "Doc update: typo in widget design doc" into jb-mr1.1-docs 2013-04-04 00:59:09 +00:00
kmccormick
57b73b4a1d am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit '72da7af68a86e61281ba0af0e159fb480913ae74':
  Doc update: unterminated code tags
2013-04-03 17:58:30 -07:00
kmccormick
68f73a15e1 Doc update: typo in widget design doc
"Bug: 7042997"

Change-Id: I89d60c42bb846514ad6792fb4a901698128a21b6
2013-04-03 17:57:57 -07:00
kmccormick
72da7af68a am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs
* commit 'b461a13f252e3888b8614a8f363f34731274e87e':
  Doc update: unterminated code tags
2013-04-03 17:55:50 -07:00
kmccormick
b461a13f25 Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 2013-04-04 00:52:26 +00:00
kmccormick
43d5abbf03 Doc update: unterminated code tags
"Bug: 7250069"

Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
2013-04-03 17:43:44 -07:00
kmccormick
c0425eecbd am ea19228d: am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit 'ea19228daabf42b4aa30d0b43638ddd5a4e3d6d5':
  Doc update: getString -> getInt
2013-04-03 17:37:20 -07:00
kmccormick
ea19228daa am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '69b7a1cb9a75374867f9d13117312335f11fe593':
  Doc update: getString -> getInt
2013-04-03 17:33:59 -07:00
kmccormick
69b7a1cb9a am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '2456a3fa3871c45378d2ad35d986cc9fa68bb5ed':
  Doc update: getString -> getInt
2013-04-03 17:31:38 -07:00