Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,805 Commits 3 Branches 0 Tags
1adf652d45bb387cbac1651d8cb20590db93c868
Commit Graph

36317 Commits

Author SHA1 Message Date
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
 2014-01-09 02:14:56 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Alan Viverette
c619b6e58b Merge "Add DisplayList bit for projecting onto a contained volume" 2014-01-09 01:35:03 +00:00
Alan Viverette
58f09b3524 Add DisplayList bit for projecting onto a contained volume 
Does not handle reordering/translating the projected DisplayList.

Change-Id: I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967
 2014-01-08 17:18:19 -08:00
Adrian Roos
73415b0c75 Merge "Don't show incorrect pattern in stealth mode." 2014-01-08 23:49:11 +00:00
Adrian Roos
e2d71e4520 Don't show incorrect pattern in stealth mode. 
Prevent the pattern keyguard from displaying an incorrect pattern when it is configured not to display patterns.

Bug: 11112503
Change-Id: I6defdcbea102e4f3e09193d61071cecc59ea3080
 2014-01-08 15:38:23 -08:00
David Christie
8e27a8f695 Merge "Document that Handler.postDelayed uses uptimeMillis() based counting. -Make it clear that delay may be longer than requested. -Potentially help developers avoid power bugs (e.g. releasing after delay). Bug: 12015795" 2014-01-08 22:58:08 +00:00
Adam Powell
9e2694b521 Merge "Move ActionMenuView into android.widget and make it public" 2014-01-08 22:44:22 +00:00
RoboErik
2dfae9bea1 Merge "b/12068020 Make kb layouts only unique to vendor/product" 2014-01-08 22:07:14 +00:00
Adam Powell
fa18d182a3 Move ActionMenuView into android.widget and make it public 
Expose ActionMenuView as a way for applications to present
ActionBar-style menus in other embedded or repeating contexts.

Change-Id: I54b7ccd9b2116ca68bc72956da9262bca9d5085f
 2014-01-08 13:53:30 -08:00
Alan Viverette
25838002c8 Merge "Allow Views to specify a theme override" 2014-01-08 20:40:39 +00:00
Craig Mautner
b859449b71 resolved conflicts for merge of 88bfc6dd to master 
Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
 2014-01-08 09:51:33 -08:00
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Mike Lockwood
7b925fbb87 am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:10:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
0203d58ecf am db47efd3: am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit 'db47efd3f8581c2c0d72a1b8617aeae9830f7ea4':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:38:37 +00:00
Narayan Kamath
ee864c0a04 am 55a12adc: am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '55a12adc19b15df4068b90439dccb868534002c7':
  AArch64: Use long for pointers
 2014-01-08 12:38:30 +00:00
Narayan Kamath
6bbda22e1c am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:38:24 +00:00
Narayan Kamath
db47efd3f8 am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '651807fcd0b1012ea848efe5f67b4381d8ce6797':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:33:16 +00:00
Narayan Kamath
55a12adc19 am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb':
  AArch64: Use long for pointers
 2014-01-08 12:33:11 +00:00
Narayan Kamath
29eadb328a am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '9a743575254d7d5d456456517171f0ee31bc9247':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:33:06 +00:00
Narayan Kamath
651807fcd0 am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:05:13 +00:00
Narayan Kamath
3f589e5d1e am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '2842bd021c11274720d6a10219538b536b7d2050':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 04:02:05 -08:00
Narayan Kamath
72a8fe6d03 am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
  AArch64: Use long for pointers
 2014-01-08 12:01:13 +00:00
Narayan Kamath
9a74357525 am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:01:09 +00:00
Narayan Kamath
74661ff119 am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit 'b5558817c78e3140fa3f9cbbe167cacf6481f47f':
  AArch64: Use long for pointers
 2014-01-08 03:58:22 -08:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:58:17 -08:00
Ashok Bhat
58b8b24256 AArch64: Use long for pointers in App/Backup 
For storing pointers, long is used, as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I7aee49dc26cf6c86af8f1d882e9cd1cc145a1977
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 11:54:01 +00:00
Ashok Bhat
738702d28a AArch64: Use long for pointers 
For storing pointers, long is used in CursorWindow
and SQLiteConnection classes as native pointers can
be 64-bit.

Change-Id: Ia686006a7b8bdc7b95e5de0d0a294b155034a921
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 11:53:21 +00:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes 
For storing pointers, long is used in hardware classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-08 10:17:21 +00:00
Jeff Brown
d14c8c9039 Add flag to force public virtual display to show own content. 
Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
 2014-01-07 19:30:07 -08:00
RoboErik
fb290df3c9 b/12068020 Make kb layouts only unique to vendor/product 
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
 2014-01-07 17:37:24 -08:00
Alan Viverette
24927f2798 Allow Views to specify a theme override 
During inflation, any view with a theme attribute will wrap its context
with a theme override. Child views inflated during recursion will inherit
the wrapped context.

BUG: 12178430
Change-Id: Icba019d1c4f4f7e1a66d19dd402038defb42b7a6
 2014-01-07 17:28:48 -08:00
John Reck
ed20ebbde5 Merge "EGL migration to native" 2014-01-07 23:39:40 +00:00
John Reck
23b797ab51 EGL migration to native 
Move EGL state management to native side for RemoteGLRenderer

Change-Id: I12b0fed70246564d4caebf87374e8bbca655c572
 2014-01-07 14:53:55 -08:00
Ian Rogers
6c6a11648f am 878df18c: am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '878df18c48fa5f0282cee5ded80238f64826cf84':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:47:37 +00:00
Ian Rogers
878df18c48 am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '8dbfde504787a002de1074a5dfac7eea9d060a43':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:45:07 +00:00
Ian Rogers
8dbfde5047 am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:41:34 +00:00
Ian Rogers
0e16e3d7dd am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 13:38:44 -08:00
Ian Rogers
f11dee7971 Merge "Add a call to registerAppInfo for the VMRuntime" 2014-01-07 21:31:18 +00:00
Adam Lesinski
dfc73e9c24 am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 
* commit '66e9b1e1178813037daf3798b8fe23467c4b91ab':
  Move SystemService code to frameworks/base/core
 2014-01-07 20:58:16 +00:00
Adam Lesinski
66e9b1e117 Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev 2014-01-07 20:53:20 +00:00
Alan Viverette
58a8a678bd Merge "Revert "Allow Views to specify a theme override"" 2014-01-07 20:30:01 +00:00
Alan Viverette
eb14ccf020 Revert "Allow Views to specify a theme override" 
Inheriting the parent view's Context breaks RemoteView inflation.

This reverts commit dd9233253b.

Change-Id: I1c9a940a31169cd42b7356ad58548597a2efbb24
 2014-01-07 20:28:56 +00:00
Dave Platt
5dd0be2936 am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '07290a7be312c5da63857903dc6931cea5a2f2ea':
  Fix descriptor leak after accepting connections
 2014-01-07 19:59:21 +00:00
Dave Platt
d5d0ab5ba9 am 1b5bc6f8: am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app 
* commit '1b5bc6f8f96fc30b651679411a4da00d3fbebaa7':
  Fix socket descriptor leak from Zygote to child app
 2014-01-07 19:59:11 +00:00
Dave Platt
07290a7be3 am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
  Fix descriptor leak after accepting connections
 2014-01-07 19:55:47 +00:00