drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,675 Commits 1 Branch 0 Tags
Commit Graph

36319 Commits

Author SHA1 Message Date
Jamie Gennis
5bbfcd3e15 am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
  Set the secureness when creating displays
 2012-10-22 13:54:53 -07:00
Jamie Gennis
167cd3e367 am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
  Set the secureness when creating displays
 2012-10-22 13:52:22 -07:00
Jamie Gennis
9fee7bd73d am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev 
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
  Set the secureness when creating displays
 2012-10-22 13:52:12 -07:00
Jamie Gennis
23d622418b Merge "Set the secureness when creating displays" into jb-mr1-dev 2012-10-22 13:49:35 -07:00
Amith Yamasani
e78d50b4a0 am 6eb9844c: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '6eb9844c8e4ff36ebb58a9e5223e69adea1156cf':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:37:19 -07:00
Amith Yamasani
6eb9844c8e am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:35:21 -07:00
Amith Yamasani
aad8cd4daa am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:34:29 -07:00
Amith Yamasani
2278898126 Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 2012-10-22 13:32:24 -07:00
Amith Yamasani
cd75706117 System server should always send broadcasts to a specific or all users 
Bug: 7368245

Log a warning if the system process calls unqualified sendBroadcast()
and other calls.

As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.

Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
 2012-10-22 12:38:53 -07:00
Adam Powell
f4c6a4e42e am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'cad6dce59653bf0a5ad015ab936948497f58b3b4':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:34:18 -07:00
Adam Powell
cad6dce596 am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:31:35 -07:00
Adam Powell
a6ea59ef49 am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:31:34 -07:00
Adam Powell
5311c4476e Remove View's long press callbacks when ACTION_CANCEL is received 
Bug 7391646

Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
 2012-10-22 12:15:49 -07:00
Baligh Uddin
e570c9c6f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-22 10:30:11 -07:00
Baligh Uddin
e53f5265d1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-22 10:28:21 -07:00
Baligh Uddin
f242dbcfe8 am 154eaa22: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '154eaa22c3dbf323c4417513c8a45967e5539ce3':
  Import translations. DO NOT MERGE
 2012-10-22 10:27:44 -07:00
Baligh Uddin
154eaa22c3 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-22 10:24:45 -07:00
Baligh Uddin
221f69b0fd Import translations. DO NOT MERGE 
Change-Id: I0e70aeaf47180803a74a258143ba462e487b0d4f
Auto-generated-cl: translation import
 2012-10-22 09:46:16 -07:00
Baligh Uddin
93c6094b67 Import translations. DO NOT MERGE 
Change-Id: I02aa0e6fa545b325429029f58d19247b9d3f3373
Auto-generated-cl: translation import
 2012-10-22 09:44:44 -07:00
Baligh Uddin
02e551c200 Import translations. DO NOT MERGE 
Change-Id: Ib5d95dba6f34050b0863776a786cd75b9def4af0
Auto-generated-cl: translation import
 2012-10-22 09:43:15 -07:00
Daniel Sandler
50ad6326c5 am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '466b77e9951aa6dab0d721e1d9bfb805bb37ffc5':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:04:38 -07:00
Daniel Sandler
363a119c52 am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:02:58 -07:00
Daniel Sandler
466b77e995 am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:02:32 -07:00
Daniel Sandler
2dd0c3a576 Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 2012-10-22 07:59:18 -07:00
Jim Miller
b5f3b707a7 Wire up "add widget" in keyguard 
Change-Id: If10e91b4ed1289259f04e0dca91db4ce8645a0f7
 2012-10-21 19:09:23 -07:00
Jim Miller
d6523da1ad Merge latest prototype changes into the framework 
Specifically, this adds the following functionality:
- portrait layout on phones
- new KeyguardViewStateManager
- new SlidingChallengeLayout
- some event wiring.

Change-Id: Ie4491416f591b6d4002d33e9803a764a8ae730f6
 2012-10-21 17:45:09 -07:00
Amith Yamasani
283d1409dd am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit 'f624d72cb0fe40fd5748d4f0d1a93bf267aa3ed8':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:50:55 -07:00
Amith Yamasani
f624d72cb0 am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:48:02 -07:00
Amith Yamasani
596f143fa6 am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:47:06 -07:00
Amith Yamasani
8074e98b20 Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 2012-10-21 07:44:46 -07:00
Jim Miller
28f1f5e6f9 Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 2012-10-19 19:19:24 -07:00
Fabrice Di Meglio
0be6a28ed5 am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '08f27b1bffbf01d9e5a102b8c90a3c2095fc82b3':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:19:00 -07:00
Fabrice Di Meglio
08f27b1bff am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '59420ecd1518289cc47c32181250539c981f85f0':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:17:06 -07:00
Fabrice Di Meglio
3f8794dfda am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '59420ecd1518289cc47c32181250539c981f85f0':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:16:59 -07:00
Fabrice Di Meglio
59420ecd15 Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 2012-10-19 19:14:30 -07:00
Fabrice Di Meglio
d3156a2a56 Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO 
This was a regression introduced by a previous CL.

- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.

The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.

Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
 2012-10-19 18:46:43 -07:00
Jim Miller
838906b165 Get basic keyguard working in new branch 
This merges the changes from the proto app into the framework.
Basic functionality tested on phone in portrait:

- Slide
- Pattern
- PIN
- Password (wonky)
- SIM PIN

Change-Id: I21b2c30cf05dc01ffb20948f41a044e7af1db25f
 2012-10-19 18:42:56 -07:00
Jamie Gennis
7bbf8163fb Set the secureness when creating displays 
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method.  In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.

Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
 2012-10-19 18:34:35 -07:00
Kenny Root
9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp 
Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8
 2012-10-19 17:16:41 -07:00
Kenny Root
a063bc51ca am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev 
* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 16:40:13 -07:00
Kenny Root
a5d29b2c14 am 9bef3294: Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev 
* commit '9bef3294d3660a85442829a25c9777e25d3c3cc8':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 16:40:07 -07:00
Kenny Root
9bef3294d3 Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev 
* changes:
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users
 2012-10-19 16:37:55 -07:00
Amith Yamasani
db6a14cc85 Fix crashes when quickly adding and removing users 
Make USER_REMOVED an ordered broadcast and send it before the user's
state is completely removed from the system. This gives services the
opportunity to clean up their state, while still having access to the
user's directory and UserInfo object (such as serial number).

Tell SyncManager to skip over dying/partially created users.

Improve UserManager tests, waiting for users to be removed fully.

Bug: 7382252

Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
 2012-10-19 16:23:30 -07:00
Christopher Tate
9fffd565a9 am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit 'e9472f2937478ead4a5c2115ee69e508e4933417':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:43:50 -07:00
Christopher Tate
e9472f2937 am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit '935415a050be75f582f632dd168be9fbb047137b':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:41:16 -07:00
Christopher Tate
3e96d3d1f9 am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 
* commit '935415a050be75f582f632dd168be9fbb047137b':
  Document immutable requirement of SharedPreferences return objects
 2012-10-19 14:41:14 -07:00
Christopher Tate
935415a050 Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 2012-10-19 14:38:05 -07:00
Daniel Sandler
d5483c3157 New lockscreen: allow search gesture from nav bar. 
Show a lights-out pip if home is invisible but search is
still OK.

Change-Id: Ifc69c12296cc8e8cf7c89dd06173d7abf499a878
 2012-10-19 16:48:12 -04:00
Christopher Tate
01ed79c578 Document immutable requirement of SharedPreferences return objects 
In particular, make it quite clear that the set returned by
getStringSet() must not be modfied by the app, period; and
add a similar caution about the map returned via getAll().

Also, fix a bug that could lead to unexpected data being committed
if the set instance passed to putStringSet() was mutated by the
app after that call (including mutations after commit() was
invoked).

Bug 7312641

Change-Id: If9a1be1b0669ac879ff7a7dc67a8805548ea10cc
 2012-10-19 13:43:52 -07:00
alanv
ac6e50a671 Catch badly formed URLs in WebView accessibility injector. 
Bug: 7206684
Change-Id: I13e8f29043314430ea3fcfa8ab59040136d06e57
 2012-10-19 12:57:41 -07:00