Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,638 Commits 3 Branches 0 Tags
019895e2e4744f9ddd76f5df6d59a74dbc5bcd42
Commit Graph

31402 Commits

Author SHA1 Message Date
Kenny Root
019895e2e4 am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:09:57 -07:00
Kenny Root
8692685a54 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-13 00:04:17 +00:00
Dianne Hackborn
18e99d1d5f am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 
* commit '15fed390c44972932f6dd7ce3bef1004e8b98b61':
  Add new resources trace, also trace apk dex loading.
 2013-04-12 17:03:03 -07:00
Dianne Hackborn
15fed390c4 Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 2013-04-12 23:58:50 +00:00
Amith Yamasani
b0511d47eb am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:36:22 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
d04215c440 am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit '0a41431d697a34e7fe4ed2c481484d7a63949037':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:23:22 -07:00
Chet Haase
0a41431d69 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87 Rename isUserRestricted to isUserLimited 
Avoid confusion with user restrictions which can be applied to
non-limited users as well.

Updated the java docs.

Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
 2013-04-12 15:13:53 -07:00
Dianne Hackborn
f7be4800df Add new resources trace, also trace apk dex loading. 
Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
 2013-04-12 14:53:10 -07:00
Kristian Monsen
82b6de03cf am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '03499a23f9d84fab95a7383b50cc7f87a974e4a8':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:10:48 -07:00
Kristian Monsen
03499a23f9 Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 2013-04-12 21:05:15 +00:00
Romain Guy
a583a5ac7f am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 
* commit 'dec4bb9e4b5a46b179a6aa3e90f9d9240d9c99cb':
  Trace ValueAnimator based animations in systrace
 2013-04-12 14:00:34 -07:00
Romain Guy
a378bab7a7 am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 
* commit '50b68bf8364fd728553cb8066ece8f7905885625':
  Add async events tracing to android.os.Trace
 2013-04-12 14:00:31 -07:00
Romain Guy
dec4bb9e4b Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 2013-04-12 20:58:36 +00:00
Romain Guy
50b68bf836 Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 2013-04-12 20:58:00 +00:00
Chet Haase
430742f090 API and doc cleanup, plus small animation/UI features 
Adding features which round out the animation APIs (missing
getters, etc.). Also fix doc typos.

Issue #8350510 Add APIs needed for future animation capabilities

Change-Id: I063736848ba26e6d6c809b15fc3a103c74222f46
 2013-04-12 13:44:22 -07:00
Emily Bernier
9b8abb5abd am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit 'ce70311b67c3dba6ed4fbda41617f4e24c82dfc7':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:25:58 -07:00
Emily Bernier
ce70311b67 Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 2013-04-12 20:21:36 +00:00
Raph Levien
1aa5248785 am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 
* commit '6c0724010f1a98e391827109c2c369b64197c449':
  Fix for bug 8500202: Right-to-left text not showing in list view
 2013-04-12 13:11:31 -07:00
Raph Levien
6c0724010f Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 2013-04-12 20:08:33 +00:00
Robert Greenwalt
2d28d6229f am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api
 2013-04-12 12:07:14 -07:00
Craig Mautner
429664a52a am d5e7b8bf: Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev 
* commit 'd5e7b8bfb4381baa36feb241bc65d4681f664592':
  Clear test rectangle if previous focus is null.
 2013-04-12 12:07:11 -07:00
Robert Greenwalt
3016244ffb Merge "Add new route.hasGateway() api" into jb-mr2-dev 2013-04-12 19:02:24 +00:00
Craig Mautner
d5e7b8bfb4 Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev 2013-04-12 19:02:06 +00:00
Raph Levien
f5cf6c9d44 Fix for bug 8500202: Right-to-left text not showing in list view 
In single line mode, changing the text from LTR to RTL (or vice versa)
affects the alignment, which in turn means that bringTextIntoView is
needed to update the scrolling. A registerForPredraw should be done to
make this happen, but it was missing. This patch tests explicitly for
direction changes in this case, and schedules a predraw if so.

Change-Id: I16e0e23141c244dc8adc00ea8306dfe4c9bf487d
 2013-04-12 11:42:25 -07:00
Robert Greenwalt
ca441ee2f0 Add new route.hasGateway() api 
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
 2013-04-12 11:22:52 -07:00
Svetoslav
9d02928e43 am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 
* commit '14c8c741f79983578a8e9c5124d142c6d85ab91b':
  Adding APIs for an accessibility service to intercept key events.
 2013-04-11 22:48:39 -07:00
Svetoslav
14c8c741f7 Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev 2013-04-12 05:45:43 +00:00
Kristian Monsen
3b9e272e0e am 83b00258: Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev 
* commit '83b002584ce27e3f405d224c0ce83d69516f87d8':
  Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
 2013-04-11 21:53:52 -07:00
Kristian Monsen
83b002584c Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev 2013-04-12 04:50:20 +00:00
Jeff Brown
dc5711eaef am bf26c9cf: Merge "Ensure looper quits after all other messages are handled." into jb-mr2-dev 
* commit 'bf26c9cf87d3b83723fd12f4678b8b4286d8d08a':
  Ensure looper quits after all other messages are handled.
 2013-04-11 21:08:38 -07:00
Jeff Brown
024136f57e Ensure looper quits after all other messages are handled. 
Bug: 8596303
Change-Id: Ie8bfbbe810f5ade2afd870c8e675ce1353a80e5d
 2013-04-11 20:40:04 -07:00
Craig Mautner
26a84dfdd0 Clear test rectangle if previous focus is null. 
A bug in FolderEditText or DynamicLayout (b/8600683) was causing
the 'rectangle' parameter passed to scrollToRectOrFocus() to be
roughly 1000 feet to the right of the screen.

This bug is normally masked because the focus found in
mLastScrolledFocus never matches the new focus and consequently
the misleading 'rectangle' is nulled. However, on the first
time in to scrollToRectOrFocus when returning to Launcher
from another app, mLastScrolledFocus is null and the code
skips over the place where 'rectangle' is nulled. Without this
clearing it was determined that 'rectangle' was outside the viewable
area and scrolling not required. This is bug 8547155.

This change causes even null values of mLastScrollFocus to be
compared to the new focus thus masking the bug in all situations.
Bug 8600683 will be fixed in a separate CL.

Fixes bug 8547155.

Change-Id: Ic6cb22c42b0e93a9793dd2babc25727c2ba29155
 2013-04-11 19:33:54 -07:00
Christopher Tate
f6a2503d4a am 5adae45a: Merge "Document the behavior of \'null\' values in SharedPreferences" into jb-mr2-dev 
* commit '5adae45addad702de4393a68b6236b1d528c58d6':
  Document the behavior of 'null' values in SharedPreferences
 2013-04-11 18:43:20 -07:00
Christopher Tate
5adae45add Merge "Document the behavior of 'null' values in SharedPreferences" into jb-mr2-dev 2013-04-12 01:41:01 +00:00
Dianne Hackborn
26c702c395 am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev 
* commit 'ba880da44c672e64f76a593ed96e514a56bc7c56':
  Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...
 2013-04-11 18:32:40 -07:00
Dianne Hackborn
ba880da44c Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly returns null..." into jb-mr2-dev 2013-04-12 01:29:14 +00:00
Dianne Hackborn
7b92467179 Fix issue #7643046: Activity.getCallingPackage() bogusly returns null... 
...after having to recreate the task stack

Change-Id: Ia354240f3650ddb578f2116a2aa4584e9ffe8508
 2013-04-11 18:12:56 -07:00
Fabrice Di Meglio
70d2c77320 am f5c757c6: Merge "More fix for bug #8159072 Spinner widget should be RTL\'ized" into jb-mr2-dev 
* commit 'f5c757c6292fb2623757ef73020d3730ead063d7':
  More fix for bug #8159072 Spinner widget should be RTL'ized
 2013-04-11 18:07:06 -07:00
Fabrice Di Meglio
f5c757c629 Merge "More fix for bug #8159072 Spinner widget should be RTL'ized" into jb-mr2-dev 2013-04-12 01:03:33 +00:00
Dianne Hackborn
bc708d8b9d am c309ca46: Merge "Fix issue #8582003: Evernote Camera Capture Failure" into jb-mr2-dev 
* commit 'c309ca4622833bf47b57366ae038500023de1668':
  Fix issue #8582003: Evernote Camera Capture Failure
 2013-04-11 18:01:30 -07:00
Dianne Hackborn
c309ca4622 Merge "Fix issue #8582003: Evernote Camera Capture Failure" into jb-mr2-dev 2013-04-12 00:58:24 +00:00
Fabrice Di Meglio
4febbf3501 am bd286426: Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb-mr2-dev 
* commit 'bd286426fae833ddbef0646b267e2a31eee4939b':
  Fix bug #8599905 Add simple BidiFormatter getInstance() helper API
 2013-04-11 17:48:39 -07:00
Fabrice Di Meglio
bd286426fa Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb-mr2-dev 2013-04-12 00:46:07 +00:00
Dianne Hackborn
b57a50bd16 Fix issue #8582003: Evernote Camera Capture Failure 
ActivityThread.currentPackageName() was actually returning
the process name.  Change this to return the package name, and
fix the one spot using it I could find that was actually wanting
the process name.

Change-Id: I323b9c5987106b5a090968e545281fc0ba55b6b8
 2013-04-11 17:29:32 -07:00
Dianne Hackborn
d9d9c17dda am 77216642: Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev 
* commit '77216642884d5131290803776b0fce4d68128e97':
  Implement #7341342 API request: way to determine current orientation...
 2013-04-11 17:11:21 -07:00
Dianne Hackborn
7721664288 Merge "Implement #7341342 API request: way to determine current orientation..." into jb-mr2-dev 2013-04-12 00:08:13 +00:00
Dianne Hackborn
b9ec1ac51b Implement #7341342 API request: way to determine current orientation... 
...to allow for orientation locking

This doesn't add an API to get the current orientation, since that is
inherantly racy.  Instead there is a new "locked" orientation mode that
locks the screen into whatever the current rotation is.

While at it, added a few other useful orientation modes.

Change-Id: I5c369e6511cb72294e9e922ea8acffd770df9440
 2013-04-11 17:07:40 -07:00
Emily Bernier
b223f73a69 Add user restrictions (credentials, user removal) 
Created constants in current.txt and UserManager.java, modified restrictions access in UserManagerService.java.

Change-Id: If8d778d84af81dcbf5784f6e0afd9ef966cc8ecf
 2013-04-11 19:56:49 -04:00