Jeff Brown
ca5ecdc2fe
am 9658de2d: Merge "Add new physical keyboard layouts."
...
* commit '9658de2df79f6472dd0728d50074e27a3553637d':
Add new physical keyboard layouts.
2013-04-05 03:28:02 -07:00
Jeff Brown
9658de2df7
Merge "Add new physical keyboard layouts."
2013-04-05 09:39:49 +00:00
Jeff Tinker
72e2307c6a
am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
...
* commit '1e0f36cffd8a4399fcd12e25bddde4544992bcb2':
Implement async event callout from drm plugin to Java app
2013-04-04 18:23:10 -07:00
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
1fdaace1b1
am 80fdc962: Merge "Error on conflicting <uses-permission>" into jb-mr2-dev
...
* commit '80fdc9624e6d53a78031bf99d34e7c01d53ad66e':
Error on conflicting <uses-permission>
2013-04-04 17:27:44 -07:00
Nick Kralevich
ecc5b43635
am 745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev
...
* commit '745a42bbb9db8d54af5381ef5fe41828bf6fc352':
aapt: add support for optional uses-permission
2013-04-04 17:27:42 -07: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
21af446ce9
am a151ef8c: Merge "First OpenGL ES 3.0 based optimization" into jb-mr2-dev
...
* commit 'a151ef8c667a52d9fae28c09f780784f19bdb039':
First OpenGL ES 3.0 based optimization
2013-04-04 15:57:21 -07:00
Romain Guy
9ff408c17b
am faec826b: Merge "Reduce the size of dirty invalidates" into jb-mr2-dev
...
* commit 'faec826bd6051e41e1299cd14d580a4f50f6fe97':
Reduce the size of dirty invalidates
2013-04-04 15:53:36 -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
Chris Craik
233f67302e
am de4f8c38: Merge "Traverse layers in update order" into jb-mr2-dev
...
* commit 'de4f8c3872c6284605c168687c69ebfa72ea49d2':
Traverse layers in update order
2013-04-04 15:32:54 -07: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
378b7b7bc7
am 5a78b1b2: Merge "Fix for bug #8146846 Phone App should be mirrored for RTL languages" into jb-mr2-dev
...
* commit '5a78b1b20d1f137f867bd1dba76377a41af1af18':
Fix for bug #8146846 Phone App should be mirrored for RTL languages
2013-04-04 14:22:35 -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
2c0283f5d1
am b2c3aa8e: Merge "PackageParser: ignore <uses-permission> android:required on older apps" into jb-mr2-dev
...
* commit 'b2c3aa8e322a4c08e3aca3a877da3732ec93e042':
PackageParser: ignore <uses-permission> android:required on older apps
2013-04-04 13:32:58 -07: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
98f69881ce
am 77d94957: Merge "Adding small animation features" into jb-mr2-dev
...
* commit '77d94957d793aba16a1352d25d5555bf59fe74e7':
Adding small animation features
2013-04-04 11:30:31 -07:00
Chet Haase
77d94957d7
Merge "Adding small animation features" into jb-mr2-dev
2013-04-04 18:24:46 +00:00
Adam Powell
2987c218e3
am 728827ff: Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev
...
* commit '728827ff472b72ed7a86971ed8e35a01ce5bc8bf':
Uphold common ordering expectations around action bar Home/Up dispatch
2013-04-04 11:05:31 -07: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
Romain Guy
ae74f59856
am eaadd123: Merge "Add internal API to query GL version number" into jb-mr2-dev
...
* commit 'eaadd123a7d7b0a02046db33e882ddcef33e1a49':
Add internal API to query GL version number
2013-04-04 10:58:33 -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
1e2c967b16
am 8712e4cc: Merge "use libphonenumber for Linkify.PHONE_NUMBER" into jb-mr2-dev
...
* commit '8712e4cc4a08f9d54013e96cc2420637c2114f08':
use libphonenumber for Linkify.PHONE_NUMBER
2013-04-04 07:47:35 -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
07e8fc89b0
am 9059d377: Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
...
* commit '9059d3775ab47b08d08ec5df1be149be52007f96':
Nuke heavy parts of notification before archiving.
2013-04-03 23:13:56 -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
6690203c7f
am 0fa30372: Fix doc build.
...
* commit '0fa30372c7768692f9deef3e33655382e8a683fd':
Fix doc build.
2013-04-03 23:02:01 -07: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
3f84b7b17d
am 26cd4d65: Merge "Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt" into jb-mr2-dev
...
* commit '26cd4d658f5c4e99c31107cef78698c818e54577':
Change BluetoothGattCallback methods argument from BluetoothDevice to BluetoothGatt
2013-04-03 20:19:51 -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
2ce80a82ed
am fb9a9713: 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 'fb9a9713f44f61958c02fb8af72fd6a61d44f2e7':
Doc update: clean up text and code snippets
2013-04-03 18:49:14 -07: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