124187 Commits

Author SHA1 Message Date
Chong Zhang
8440a33b25 Merge "support time lapse/slow motion on SURFACE source" 2014-02-24 17:52:01 +00:00
Marco Nelissen
4531e9c45c Merge "Add method to get redirected Uri" 2014-02-24 17:14:28 +00:00
Ashok Bhat
84bbeb9e0c Use long for pointers in opengl/EGL classes
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen script

This patch updates EGL classes in frameworks/base to support
64-bit platforms. Key changes in the EGL classes include

[x] EGLObjectHandle class - EGLObjectHandle class has two public
    methods (constructor and getHandle) that assume handles are
    32-bit. They have not been changed. Instead, two new hidden
    methods (EGLObjectHandle(long) and getNativeHandle) have been
    added.

[x] EG14 class - Two public methods eglGetDisplay and
    eglCreatePbufferFromClientBuffer assume that handles are 32-bit.
    They have been changed to throw unsupported operation exception
    on non 32-bit machines. Two new methods eglGetDisplay(long)
    and eglCreatePbufferFromClientBuffer(...long buffer..) have
    been added to support 64-bit handles.

Change-Id: I9e0f064e5b33700eb0baa2e1841a21f931f7a765
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-24 15:50:22 +00:00
Ashok Bhat
01c26ea89d Use reinterpret_cast when an integer is cast to a pointer
Note that files changed in this patch have been generated
by running frameworks/native/opengl/tools/glgen/gen script.

Change-Id: Iff3ac2e804af41b9a6ec073fd65019c6806fe821
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-24 14:33:52 +00:00
Torne (Richard Coles)
875e2101d7 Fix missing # in method name in javadoc.
Fix doc generation.

Change-Id: I2e333a7224eeaff7a870fedc7f7a4eb113d1fe2f
2014-02-24 14:11:56 +00:00
Yohei Yukawa
e0ebe276e5 Merge "Remove trailing spaces and tabs" 2014-02-24 11:20:49 +00:00
Yohei Yukawa
66996dafa7 Remove trailing spaces and tabs
Actual fix will be covered by subsequent patches.

BUG: 12954290
Change-Id: I55f2374fd447d5b3d5a696de6f9b493e32f4e17a
2014-02-24 19:51:04 +09:00
Sander Alewijnse
627de95925 Merge "Enables a profile owner or device owner to set and clear default intent handler activities." 2014-02-24 10:16:28 +00:00
Alan Viverette
12b97f5d2b Change colorFilterColor to tint, allow use of ColorStateList
BUG: 13149901
Change-Id: I6487bec372cb74db53d7bbdfa35de071764763b0
2014-02-23 18:32:20 -08:00
Dan Sandler
82a6c5c5ff Default Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS=1.
Change-Id: I849d4def1dcf220c226349f1591a8ba00b603854
2014-02-24 01:28:44 +00:00
Alan Viverette
cc3f33853b Allow alpha modulation in ColorStateList items
This makes it much easier to define a disabled state color as an alpha
modulation of some base color.

Change-Id: Ie2ecf40b1f6560fcd8eda208d780616dddfc0d08
2014-02-22 16:52:46 -08:00
Deepanshu Gupta
cba616d85f Merge "Update layoutlib tests to check methods return value." 2014-02-22 19:04:48 +00:00
Craig Mautner
92a507986a am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit '3dc57b39f2a87fe3692b5606de2b0c0693fc485c':
  Fixes for ActivityView on home activity
2014-02-22 07:51:02 +00:00
Craig Mautner
3dc57b39f2 am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit 'c004c9a87f0d4afa3a01f39922ad934def93c776':
  Fixes for ActivityView on home activity
2014-02-22 07:44:51 +00:00
Craig Mautner
c004c9a87f am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular-dev
* commit 'ffda464851008f750246f343c939d8003071cd23':
  Fixes for ActivityView on home activity
2014-02-22 07:33:24 +00:00
Craig Mautner
ffda464851 Merge "Fixes for ActivityView on home activity" into klp-modular-dev 2014-02-22 05:11:22 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
2014-02-21 21:08:00 -08:00
Scott Main
3196d811d0 am a0e30c4b: am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit 'a0e30c4b9dc1b0acb019f07c0d124d97740c93a2':
  add android studio to launch procedures
2014-02-22 04:10:11 +00:00
John Reck
e56e9df5f1 Add back resize buffer
Bug: 12825810

Change-Id: Ic2329c30524010f54778101853b30f8f8d9eeb6c
2014-02-21 18:12:04 -08:00
Craig Mautner
5eb4adcbda resolved conflicts for merge of d2794f5e to master
Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
2014-02-21 17:52:15 -08:00
Chris Craik
919e95cc23 Modulate shadow alpha by caster alpha
Change-Id: Ibc4b3958feb3b5dba91d30af470d76555a6209c8
2014-02-21 17:15:12 -08:00
Scott Main
a0e30c4b9d am 5670ddea: am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '5670ddea3bc16c43a2040a5a224ed5fda53d7072':
  add android studio to launch procedures
2014-02-22 01:01:18 +00:00
Chris Craik
ff641477a7 Damage IsolatedZVolume when shadows change
bug:12874322
Change-Id: I3dd92f551dfb00965ccd08647586f378f8949b1c
2014-02-21 16:59:56 -08:00
Scott Main
5670ddea3b am f8a68404: am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit 'f8a68404c767cf4e5f3e63ab53737472066a90c1':
  add android studio to launch procedures
2014-02-22 00:57:36 +00:00
Craig Mautner
d2794f5eb3 am 21c09e8a: am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev
* commit '21c09e8a58982531f69dcbce760be42528bc9f9d':
  Reset deferred task removal when app token added.
2014-02-22 00:57:31 +00:00
Craig Mautner
21c09e8a58 am f0f45452: Merge "Reset deferred task removal when app token added." into klp-modular-dev
* commit 'f0f454522ae5024645a292596e644c6f7a06853c':
  Reset deferred task removal when app token added.
2014-02-22 00:53:43 +00:00
Scott Main
f8a68404c7 am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '271f85399bbbe0b6a6719286a4b0857ff845cfc2':
  add android studio to launch procedures
2014-02-22 00:53:21 +00:00
Craig Mautner
f0f454522a Merge "Reset deferred task removal when app token added." into klp-modular-dev 2014-02-22 00:50:55 +00:00
Scott Main
271f85399b am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit 'b26117aca0daadeb51369c8da617d5b7ba9b05b6':
  add android studio to launch procedures
2014-02-22 00:50:08 +00:00
Alan Viverette
550267f72b Fix refactoring of invalidate methods
Was incorrectly clearing the DRAWN flag and updating mLastIsOpaque from
partial invalidations, though why this should be different is somewhat
of a mystery.

BUG: 13138721
Change-Id: Ic8d11a64406bc78e94adec7355c1f50d87567887
2014-02-21 16:48:33 -08:00
Scott Main
b26117aca0 am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '25b44ae684295b53ac7ba15d827fc03c51aee37b':
  add android studio to launch procedures
2014-02-22 00:47:08 +00:00
Greg Hackmann
4418372b21 am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-22 00:46:52 +00:00
Craig Mautner
42bf39edbd Reset deferred task removal when app token added.
A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.

Also added improved debugging.

Fixes bug 12987986.

Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
2014-02-21 16:46:22 -08:00
Scott Main
25b44ae684 Merge "add android studio to launch procedures" into klp-docs 2014-02-22 00:43:26 +00:00
Greg Hackmann
5f652b9fdf am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
* commit '0cab896a987f6687affd5c50c3bdbe10745c8dff':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-22 00:42:52 +00:00
Alan Viverette
3b49a8a629 Fix typo in invalidate
BUG: 13138721
Change-Id: If7e10208c3ba752eca5f5cbcf26f8a63b1f4ad51
2014-02-21 16:37:32 -08:00
Greg Hackmann
0cab896a98 resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
Change-Id: Ibc41f0248235afca9546829e00b31003d09f4f7e
2014-02-21 16:35:52 -08:00
Alan Viverette
26b7b8b587 Merge "Fix conditional in invalidateInternal" 2014-02-22 00:23:46 +00:00
Deepanshu Gupta
9be03c4e98 Update layoutlib tests to check methods return value.
The test in layoutlib bridge has been updated to check the return
value of the delegate method match the value of the overriden method.

This changeset also fixes the problems found due to this change.

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
2014-02-21 16:22:10 -08:00
Adam Lesinski
4c90185a35 am 542b55d9: am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '542b55d9a4bee2f98f8a0a6948e0873c5faaddc7':
  Fix broken IME when decrypting storage
2014-02-22 00:20:57 +00:00
Alan Viverette
f4f4e863be Fix conditional in invalidateInternal
BUG: 13138721
Change-Id: I433faff7d3e93796dca59ac5b2706c59901558ba
2014-02-21 16:19:06 -08:00
Chad Brubaker
c023453a2b Only allow System apps to make VPN exempt routes
requestRouteToHost will only allow system applications to make routes
exempt from the VPN's routing rules.

If a VPN is currently running and a non-system app requests a route it
will only succeed if that host is currently covered by a VPN exempt
routing rule. Otherwise it will fail.

For example, if a VPN is running and the MMS network is brought online
those routes will be added as VPN exempt. If an application then tries
to request a route to a MMS endpoint it will succeed because the routes
already exist. If an application tries to request a route to a host
covered by the VPN the call will fail.

Bug: 12937545
Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f
2014-02-21 15:30:02 -08:00
Alan Viverette
dc8d7db35a Merge "Fix transient state, accessibility focus in ListView, GridView" 2014-02-21 23:19:21 +00:00
Guang Zhu
c8124a1e79 Merge "add new accessibility action for EditText to set text content" 2014-02-21 22:28:22 +00:00
Adam Lesinski
542b55d9a4 am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit 'c866151926b7672a58a7312c8083612bdc567fb4':
  Fix broken IME when decrypting storage
2014-02-21 22:19:50 +00:00
Adam Lesinski
c866151926 am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev
* commit '83930aa09aecef7429d8a1c07b80f10b7e2e13f6':
  Fix broken IME when decrypting storage
2014-02-21 22:17:26 +00:00
Adam Lesinski
83930aa09a Merge "Fix broken IME when decrypting storage" into klp-modular-dev 2014-02-21 22:13:44 +00:00
Adam Lesinski
8793dd873d Fix broken IME when decrypting storage
Bug:13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
2014-02-21 14:06:47 -08:00
Greg Hackmann
9e413bf4e5 am bbfc08b3: Merge changes I6d4fdada,Ia34899a4
* commit 'bbfc08b3abc0934f67659f3238eb79dcac838c17':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-21 13:04:00 -08:00
Greg Hackmann
bbfc08b3ab Merge changes I6d4fdada,Ia34899a4
* changes:
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
2014-02-21 21:01:00 +00:00