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

84768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
910500b17c am 04951a51: Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev 
* commit '04951a51f8b8cc4fade3742ab0de8e74cd86807a':
  New implementation for ScaleGestureDetector
 2012-08-28 18:54:29 -07:00
Adam Powell
04951a51f8 Merge "New implementation for ScaleGestureDetector" into jb-mr1-dev 2012-08-28 18:51:24 -07:00
Craig Mautner
27ff8538f7 am 73439236: am c479b55a: Merge "Check proximity detector before powering off." into jb-mr1-dev 
* commit '73439236885c557fd59d26714814e5f2512dafdc':
  Check proximity detector before powering off.
 2012-08-28 17:20:42 -07:00
Craig Mautner
7343923688 am c479b55a: Merge "Check proximity detector before powering off." into jb-mr1-dev 
* commit 'c479b55abe059776392af54685b77a825871781e':
  Check proximity detector before powering off.
 2012-08-28 17:18:47 -07:00
Craig Mautner
c479b55abe Merge "Check proximity detector before powering off." into jb-mr1-dev 2012-08-28 17:16:28 -07:00
Craig Mautner
4ccbdd1770 Check proximity detector before powering off. 
Do not automatically power off if the proximity detector wakelock is
active.

Fixes bug 7047455.

Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d
 2012-08-28 17:12:52 -07:00
Amith Yamasani
824b8dedbb am ef81aac0: am 7af0c166: Merge "Fix recents list for multiuser" into jb-mr1-dev 
* commit 'ef81aac0cd95871ec8f3638d3cdd27aeea87a0b6':
  Fix recents list for multiuser
 2012-08-28 17:08:04 -07:00
Amith Yamasani
ef81aac0cd am 7af0c166: Merge "Fix recents list for multiuser" into jb-mr1-dev 
* commit '7af0c166f01f80dbe28339c46b1d381837f92b73':
  Fix recents list for multiuser
 2012-08-28 17:05:32 -07:00
Amith Yamasani
7af0c166f0 Merge "Fix recents list for multiuser" into jb-mr1-dev 2012-08-28 17:02:29 -07:00
Amith Yamasani
3f1a2d15f6 am 5d33cdb5: am c3815a56: Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev 
* commit '5d33cdb5ac24a7a234fbb9db09d652b10677e25b':
  Fix PendingIntent caching for multiuser
 2012-08-28 17:01:21 -07:00
Amith Yamasani
5d33cdb5ac am c3815a56: Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev 
* commit 'c3815a5679c21a6b09c2deaa6baedd124f9e717a':
  Fix PendingIntent caching for multiuser
 2012-08-28 16:58:48 -07:00
Amith Yamasani
c3815a5679 Merge "Fix PendingIntent caching for multiuser" into jb-mr1-dev 2012-08-28 16:56:19 -07:00
Elliott Hughes
989e14bee1 Merge "Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings." 2012-08-28 16:54:14 -07:00
Elliott Hughes
47a0539eca Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
Change-Id: Id9e3b678a98751c4ca85f63b130cc7781d2a6cfe
 2012-08-28 16:41:37 -07:00
John Reck
5a55494d15 am 992fde95: am b5b2acec: Merge "Remove dead code" into jb-mr1-dev 
* commit '992fde950886606adbe29b523188428308e7502d':
  Remove dead code
 2012-08-28 16:32:20 -07:00
John Reck
992fde9508 am b5b2acec: Merge "Remove dead code" into jb-mr1-dev 
* commit 'b5b2acec806a3acfbecb63839f8da431e8a9daab':
  Remove dead code
 2012-08-28 16:30:50 -07:00
John Reck
b5b2acec80 Merge "Remove dead code" into jb-mr1-dev 2012-08-28 16:28:15 -07:00
John Reck
25b86b6bf0 Remove dead code 
Change-Id: Ice4bf3a94743019a8fc8ab04ee3de19f27a9e2c3
 2012-08-28 16:24:28 -07:00
Adam Powell
618cbea4e7 New implementation for ScaleGestureDetector 
This solves the problems around active pointer tracking when the
caller may skip events in the MotionEvent stream and replaces the
old implementation with a much simpler algorithm.

Change-Id: I6b15a2e215cab7b9559db800fcc57374702357fc
 2012-08-28 16:20:32 -07:00
Irfan Sheriff
95cedb19ed am 5aa9b043: am 608e5c41: Merge "Fix join scenario with provision discovery" into jb-mr1-dev 
* commit '5aa9b043e75c3963e16c8af2260081b9af0b2bed':
  Fix join scenario with provision discovery
 2012-08-28 16:12:59 -07:00
Irfan Sheriff
5aa9b043e7 am 608e5c41: Merge "Fix join scenario with provision discovery" into jb-mr1-dev 
* commit '608e5c416f15fb6d71ec6e3024ff2579fe006637':
  Fix join scenario with provision discovery
 2012-08-28 16:10:39 -07:00
Irfan Sheriff
608e5c416f Merge "Fix join scenario with provision discovery" into jb-mr1-dev 2012-08-28 16:07:40 -07:00
Irfan Sheriff
4bbb13976e Fix join scenario with provision discovery 
Bug: 7072467
Change-Id: I8aafd5cee1055463aeda26ad313071cfe4e335c6
 2012-08-28 16:05:43 -07:00
Dianne Hackborn
e42c5d52e2 am 8c9c235f: am def8b0f0: Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev 
* commit '8c9c235f520cd56289a305be815b30cce9784495':
  Fix infinite loop when uninstalling apps.
 2012-08-28 16:05:09 -07:00
Dianne Hackborn
8c9c235f52 am def8b0f0: Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev 
* commit 'def8b0f011b5b2b02235063d5021ddfd58aa0baf':
  Fix infinite loop when uninstalling apps.
 2012-08-28 16:03:53 -07:00
Dianne Hackborn
def8b0f011 Merge "Fix infinite loop when uninstalling apps." into jb-mr1-dev 2012-08-28 16:01:53 -07:00
Dianne Hackborn
377de7b13e Fix infinite loop when uninstalling apps. 
Change-Id: Ibdf7fa832529a358d1115fc300651101c5185484
 2012-08-28 15:57:33 -07:00
Baligh Uddin
6013978aa8 am f3a4f90f: (-s ours) am b2100187: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'f3a4f90f56d5e1efa1522526b7b021d1a7154c8a':
  Import translations. DO NOT MERGE
 2012-08-28 15:55:20 -07:00
Baligh Uddin
f3a4f90f56 am b2100187: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b210018760997ee76940080b3257dda0958b681f':
  Import translations. DO NOT MERGE
 2012-08-28 15:52:59 -07:00
Baligh Uddin
b210018760 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:51:02 -07:00
Amith Yamasani
d2e99565f5 Fix recents list for multiuser 
Since the Recents is now an activity running in the respective user's sandbox,
it shouldn't use the special API to get the current user's recent tasks.
Otherwise it causes all users to fetch the state of the current foreground user
instead of their own recents.

Change-Id: Ice8c2978e6a7ae71c44666c79a19ac07a2cbea1b
 2012-08-28 15:49:06 -07:00
Baligh Uddin
4216984c05 Merge "Import translations. DO NOT MERGE" 2012-08-28 15:48:43 -07:00
Baligh Uddin
8f6c0fb66c am 3e328cce: (-s ours) am 97d8f838: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '3e328cce5f1c0983e713c2435fc141c034158891':
  Import translations. DO NOT MERGE
 2012-08-28 15:36:26 -07:00
Baligh Uddin
3e328cce5f am 97d8f838: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '97d8f83818d36397805a8844ce5d71ce3a5fe069':
  Import translations. DO NOT MERGE
 2012-08-28 15:34:04 -07:00
Baligh Uddin
97d8f83818 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:31:22 -07:00
Baligh Uddin
3dc1998d87 Merge "Import translations. DO NOT MERGE" 2012-08-28 15:25:47 -07:00
Baligh Uddin
6244f0cb4a Merge "Import translations. DO NOT MERGE" 2012-08-28 15:21:17 -07:00
rich cannings
d72fa31644 am a76fd600: am 2deaa369: Merge "Add permission checks for Verification API calls" into jb-mr1-dev 
* commit 'a76fd600e8f886bfb3893cc09ec40c996ffe1cde':
  Add permission checks for Verification API calls
 2012-08-28 15:19:28 -07:00
rich cannings
a76fd600e8 am 2deaa369: Merge "Add permission checks for Verification API calls" into jb-mr1-dev 
* commit '2deaa3698d33d428b527329537440ab65ae8dced':
  Add permission checks for Verification API calls
 2012-08-28 15:16:47 -07:00
rich cannings
2deaa3698d Merge "Add permission checks for Verification API calls" into jb-mr1-dev 2012-08-28 15:14:26 -07:00
Craig Mautner
a65517e4df am 62814d5c: am b1a1e5ca: Merge "Use correct WindowManager for Toast." into jb-mr1-dev 
* commit '62814d5cf8a66ae5643e19304978cc3b668a7d3d':
  Use correct WindowManager for Toast.
 2012-08-28 14:48:14 -07:00
Craig Mautner
62814d5cf8 am b1a1e5ca: Merge "Use correct WindowManager for Toast." into jb-mr1-dev 
* commit 'b1a1e5ca7d3a2a93d6741db40aeba1467a8631cb':
  Use correct WindowManager for Toast.
 2012-08-28 14:46:32 -07:00
Craig Mautner
b1a1e5ca7d Merge "Use correct WindowManager for Toast." into jb-mr1-dev 2012-08-28 14:43:59 -07:00
Amith Yamasani
4ea6069323 Fix PendingIntent caching for multiuser 
Store the userId in the PendingIntentRecord.Key, so that it doesn't match
an identical pending intent from another user.

Change-Id: Icfc39e0f717c902dc3a60bdf5283a3402bbd2eaa
 2012-08-28 14:34:53 -07:00
Craig Mautner
b6ee2a2429 Use correct WindowManager for Toast. 
The WindowManager retrieved from the activity Context with
getSystemService is incorrect for a Toast. Because it contains
a parent window when addView is called its LayoutParams.token
is set to the value of the parent window. Then when an Activity
is dismissed WindowManagerGlobal.closeAll() sees the incorrect
token and incorrectly closes the Toast.

This fix uses the application Context instead of the activity
Context to retrieve a WindowManager with no parent window. This
leaves the token unchanged and keeps from dismissing the toast when
the activity is closed.

Fixes bug 7048792.

Change-Id: I92c3095d8fabd6e9e4206e9bc8e917885ab322a9
 2012-08-28 14:28:53 -07:00
rich cannings
7e67151b91 Add permission checks for Verification API calls 
Ensure that only applications with
android.Manifest.permission.PACKAGE_VERIFICATION_AGENT can call application
verification APIs, like PackageManager.verifyPendingInstall and
PackageManager.extendVerificationTimeout

Bug: 7049083
Change-Id: I5fc28b37e864d67cd319a1ed9d03a90dd15ad052
 2012-08-28 14:00:46 -07:00
Daniel Sandler
cab82ad6f5 am 719848b2: am 0d43c567: am 393e3170: am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 
* commit '719848b2537d8af66051154a73d7c0b7d583e754':
  SystemUI: Fix data activity overlay not being removed when data is disabled
 2012-08-28 13:46:39 -07:00
Jean-Baptiste Queru
8a4d29e601 am 5f615660: am 8d864647: am 1112a376: am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter" 
* commit '5f6156601a5cc26f8304b50c0601462a3fc5d380':
  Change StringTokenizer to TextUtils.StringSplitter
 2012-08-28 13:46:35 -07:00
Daniel Sandler
719848b253 am 0d43c567: am 393e3170: am ad955fe8: Merge "SystemUI: Fix data activity overlay not being removed when data is disabled" 
* commit '0d43c567cea30e6fb7af0f7adadb1c620339c0f5':
  SystemUI: Fix data activity overlay not being removed when data is disabled
 2012-08-28 13:44:03 -07:00
Jean-Baptiste Queru
5f6156601a am 8d864647: am 1112a376: am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter" 
* commit '8d8646471cfef1f31b4d2211d9b33c4071776ae4':
  Change StringTokenizer to TextUtils.StringSplitter
 2012-08-28 13:44:00 -07:00