John Spurlock
62a4858b79
Merge "Hide carrier string when emergency call button pressed." into jb-mr2-dev
2013-03-21 10:52:25 +00:00
Amith Yamasani
1eab5f2693
Fix javadoc breakage
...
Change-Id: I72df82a8855322145c870bd8db64da81533be4cc
2013-03-20 23:54:07 -07:00
Amith Yamasani
d4f8800801
Merge "Application restrictions API" into jb-mr2-dev
2013-03-21 06:12:38 +00:00
Wink Saville
4deaf8934b
am 6837f4a4: am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
...
* commit '6837f4a44235f96d410190806448ddf43d2fe696':
Fix Watchdog HeartbeatHandler to run on correct thread
2013-03-20 22:42:19 -07:00
Wink Saville
6837f4a442
am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
...
* commit 'e4679750c538e982bb81f4eea2343e8bede3e118':
Fix Watchdog HeartbeatHandler to run on correct thread
2013-03-20 22:40:17 -07:00
Amith Yamasani
df2e92a535
Application restrictions API
...
Adds the ability for apps to export some restrictions. The restrictions
are presented in Settings based on the restriction type. The user's
selections are stored by UserManagerService and provided to the
target user's application as a list of RestrictionEntry objects which
contain the key, value(s).
Also introduce a manifest entry for system apps to request that the
app be automatically installed in all users, so that they cannot be
deselected by the owner user.
Shared account filtering for non-whitelisted apps.
Change-Id: I15b741e3c0f3448883cb364c130783f1f6ea7ce6
2013-03-20 22:29:59 -07:00
Wink Saville
e4679750c5
Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
2013-03-21 04:49:28 +00:00
Romain Guy
9eac52698b
Merge "Optimize text GL setup" into jb-mr2-dev
2013-03-21 01:54:42 +00:00
Chris Craik
7564c716bb
Merge "Use snapshot alpha in all layer drawing" into jb-mr2-dev
2013-03-21 01:17:29 +00:00
Jim Miller
426da33976
Merge "Fix bad merge in KeyguardHostView" into jb-mr2-dev
2013-03-21 00:29:22 +00:00
Jim Miller
c81a5d6321
Fix bad merge in KeyguardHostView
...
This restores the fix detailed in Change-Id: I866d4b42493df3a6449d8eabc3ea140dc39dac57
Change-Id: Ibe75afd7a612cf96a56e5815a198c2047c7ff5bd
2013-03-20 17:26:53 -07:00
Chris Craik
f7dfc05f69
Merge "Update snapshot upon saveLayer deferral" into jb-mr2-dev
2013-03-21 00:25:36 +00:00
Chris Craik
e83569ca76
Use snapshot alpha in all layer drawing
...
Change-Id: Icc093390da2fc36b2b6693d0e5e4357b2f730bf9
2013-03-20 17:24:36 -07:00
Mathias Agopian
7e55414f22
Merge "make sure screencap's data stream matches what adb expects" into jb-mr2-dev
2013-03-21 00:07:55 +00:00
Eric Laurent
fc7c9b484a
Merge "audio service: allow touch sounds customization" into jb-mr2-dev
2013-03-21 00:05:08 +00:00
kmccormick
1467873aa4
am 0f6a93c4: am a75e413a: am 42d5732d: am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
...
* commit '0f6a93c48d9e6663b188b3cca9b61ddb7e2aa2e3':
Doc update: notification class bug fix
2013-03-20 17:03:41 -07:00
kmccormick
0f6a93c48d
am a75e413a: am 42d5732d: am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
...
* commit 'a75e413a3a93d6bdafdff142400d7ded2b647ae4':
Doc update: notification class bug fix
2013-03-20 17:02:30 -07:00
Chet Haase
75dfe46e36
Merge "Add auto-cancel ability to ObjectAnimator" into jb-mr2-dev
2013-03-21 00:02:03 +00:00
kmccormick
a75e413a3a
am 42d5732d: am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
...
* commit '42d5732db218c5d37ecf66f268c0ed420cf3b882':
Doc update: notification class bug fix
2013-03-20 16:59:42 -07:00
kmccormick
42d5732db2
am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
...
* commit '728c4a7e4c19f134b82dbda2c8b1457a890e3765':
Doc update: notification class bug fix
2013-03-20 16:57:42 -07:00
kmccormick
728c4a7e4c
am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
...
* commit '90ea5cc31f58b97bd3c61b6d01621d7ddd012102':
Doc update: notification class bug fix
2013-03-20 16:55:38 -07:00
kmccormick
90ea5cc31f
Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
2013-03-20 23:52:30 +00:00
Romain Guy
257ae3502c
Optimize text GL setup
...
Only performs the GL setup steps when at least one glyph is drawn.
This change also skips various draw operations when the specified
paint draws with alpha = 0.
Change-Id: I9eda148b0503acffc552ee19196f5d52e958a1a2
2013-03-20 16:35:05 -07:00
Chris Craik
d90144db52
Update snapshot upon saveLayer deferral
...
bug:8409891
In order to defer fbo-targetting saveLayer operations, it's necessary
to update the snapshot at defer time so that deferred display state
(namely, clip and transform) are fbo relative.
Re-enables deferring, as the issues with saveLayer are fixed.
Change-Id: I74b0779bc732675c747208f0757c3ea85f6dfbed
2013-03-20 16:32:53 -07:00
Chet Haase
10c4d99f04
Merge "Manage drawable invalidation automatically for Overlays" into jb-mr2-dev
2013-03-20 23:30:53 +00:00
Chet Haase
633326e29f
Manage drawable invalidation automatically for Overlays
...
Drawables added to a view's Overlay will now cause the Overlay to
be invalidated via the normal drawable-invalidation mechanism. That is,
changes to any of the drawables in the overlay should cause invalidation of
the proper area of the overlay and thus the hostView, causing the appropriate
area to be redrawn.
Also, fixed a bug in drawable invalidation so that bounds changes will now
correctly invalidate both the old and new bounds areas.
Issue #8350510 Add APIs needed for future animation capabilities
Change-Id: Icae5fa0e420232ee17dc39be10084345bae8dbd8
2013-03-20 16:23:33 -07:00
Kenny Root
afd10322f5
am d9520336: am 20345bd8: Merge "Update SELinux JNI to use helpers"
...
* commit 'd9520336a74560cdd983c9480b2e6a317dd8a193':
Update SELinux JNI to use helpers
2013-03-20 16:08:11 -07:00
Kenny Root
dfdacaf2c5
am bda3e26f: am 42457027: Merge changes I65f7a915,I32098dc0
...
* commit 'bda3e26f6f8ed0653e28b0375ba0a7f54f698e86':
KeyStore: add "migrate" command
KeyStore: add API to uid versions
2013-03-20 16:08:08 -07:00
Kenny Root
d9520336a7
am 20345bd8: Merge "Update SELinux JNI to use helpers"
...
* commit '20345bd81b866738f75c8b47a940b941b894cde1':
Update SELinux JNI to use helpers
2013-03-20 16:06:02 -07:00
Kenny Root
bda3e26f6f
am 42457027: Merge changes I65f7a915,I32098dc0
...
* commit '424570273bc225edaf7425385812b173adeb8695':
KeyStore: add "migrate" command
KeyStore: add API to uid versions
2013-03-20 16:05:59 -07:00
kmccormick
6dc8d6ff82
Doc update: notification class bug fix
...
Bug # 8289218
Change-Id: I8bc10aa4a227f8125824d69a6202c383b7de256f
2013-03-20 15:45:01 -07:00
Mathias Agopian
0137fb8937
make sure screencap's data stream matches what adb expects
...
adb assumes the stride is always equal to the width, so
we make sure it's actually the case (screenshot don't
always have this guarantee).
Change-Id: I643b909f6542b7493a611afc6e3c86955b984352
2013-03-20 15:40:45 -07:00
Joe Fernandez
3be79f328a
am 2c824c21: am ad070e0c: am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
...
* commit '2c824c21aa11253d95e2ff17f2d0d09d183f7e90':
docs: NDK r8e Release Notes
2013-03-20 15:33:56 -07:00
kmccormick
b332bc87b5
am ccc7841d: am 72d4a56d: am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
...
* commit 'ccc7841d098dc33a48aa738fc46b13f65ee5281f':
Doc Update: GCM cleanup
2013-03-20 15:30:27 -07:00
Joe Fernandez
2c824c21aa
am ad070e0c: am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
...
* commit 'ad070e0c360fd6f02b6f6f128b42b89251449a62':
docs: NDK r8e Release Notes
2013-03-20 15:28:48 -07:00
Fabrice Di Meglio
19eceaadd7
Merge "Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies" into jb-mr2-dev
2013-03-20 22:27:37 +00:00
Joe Fernandez
ad070e0c36
am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
...
* commit '1d7ac400064c90937bd322f66970a66b548c5025':
docs: NDK r8e Release Notes
2013-03-20 15:26:37 -07:00
Kenny Root
20345bd81b
Merge "Update SELinux JNI to use helpers"
2013-03-20 22:26:03 +00:00
Chris Craik
c595965b3d
Merge "Use snapshot alpha for layers" into jb-mr2-dev
2013-03-20 22:25:32 +00:00
kmccormick
ccc7841d09
am 72d4a56d: am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
...
* commit '72d4a56d827a8fd256adde3ac013f013fe497deb':
Doc Update: GCM cleanup
2013-03-20 15:25:16 -07:00
Chris Craik
47ab7d6612
Use snapshot alpha for layers
...
Removes mMultipliedAlpha, using the snapshot alpha for all
non-overlapping display list alpha control.
Additionally, fixes opacity issues where children of
hasOverlappingRendering=false displaylists (both hw layer sublists and
other sublists with hasOverlappingRendering=false)
Change-Id: I1d0e561a4d4965d06c2a6827c7a31e6dbf731b86
2013-03-20 15:24:26 -07:00
Kenny Root
cd19e3f2db
Update SELinux JNI to use helpers
...
Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
2013-03-20 15:24:25 -07:00
Joe Fernandez
1d7ac40006
am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
...
* commit 'bb3f2b9cf47b865613efc1045e6a982fe853ade8':
docs: NDK r8e Release Notes
2013-03-20 15:24:10 -07:00
kmccormick
72d4a56d82
am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
...
* commit '4e8453b5b5f75e74acdeb5e528b5166bc6a4f5b8':
Doc Update: GCM cleanup
2013-03-20 15:23:11 -07:00
Chris Craik
4494599e5a
Merge "Use snapshot alpha for layers" into jb-mr2-dev
2013-03-20 22:22:44 +00:00
Joe Fernandez
bb3f2b9cf4
am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
...
* commit '15de1aa94d5222dc6ae35f148bfa514218f60a07':
docs: NDK r8e Release Notes
2013-03-20 15:21:45 -07:00
kmccormick
4e8453b5b5
am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
...
* commit 'd42b977aacfba6646edb5331d9321ad1f02c7258':
Doc Update: GCM cleanup
2013-03-20 15:20:45 -07:00
kmccormick
d42b977aac
am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
...
* commit '5640b8293cecf4c060c8847559bd017826d03180':
Doc Update: GCM cleanup
2013-03-20 15:18:11 -07:00
Joe Fernandez
15de1aa94d
Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
2013-03-20 22:17:35 +00:00
kmccormick
5640b8293c
Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
2013-03-20 22:14:12 +00:00