Dianne Hackborn
11dc37686f
am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
...
* commit '18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93':
Add new resources trace, also trace apk dex loading.
2013-04-12 17:06:37 -07: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
8c176b2513
am b0511d47: am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
...
* commit 'b0511d47eb15f4f7941d278467964f2cd6dd2871':
Rename isUserRestricted to isUserLimited
2013-04-12 15:39:15 -07: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
1d9648df51
am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
...
* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
API and doc cleanup, plus small animation/UI features
2013-04-12 15:26:55 -07: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
6c3ec1cf99
am 82b6de03: am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev
...
* commit '82b6de03cf2d3a66881cc3664dfdcf80c885c226':
Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
2013-04-12 14:14:30 -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
f5539cb30c
am a583a5ac: am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev
...
* commit 'a583a5ac7fcf5b1478297e20b2cd34872f0e18e9':
Trace ValueAnimator based animations in systrace
2013-04-12 14:04:10 -07:00
Romain Guy
190a0f24db
am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev
...
* commit 'a378bab7a7ea4f748c72b0d14acbdf9359dbebfb':
Add async events tracing to android.os.Trace
2013-04-12 14:04:07 -07: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
d65b268fcd
am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
...
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
Add user restrictions (credentials, user removal)
2013-04-12 13:29:35 -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
c1f5756c23
am 1aa52487: am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev
...
* commit '1aa524878591dce809000e7263378138ccd6a25a':
Fix for bug 8500202: Right-to-left text not showing in list view
2013-04-12 13:15:37 -07: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
720471f0fd
am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
...
* commit '2d28d6229f8cb5e158998de421ee0a0d1ff865fe':
Add new route.hasGateway() api
2013-04-12 12:11:20 -07:00
Craig Mautner
ffe0c56c29
am 429664a5: am d5e7b8bf: Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev
...
* commit '429664a52ab0d024757650a246297ae8224e60dc':
Clear test rectangle if previous focus is null.
2013-04-12 12:11:17 -07: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
Baligh Uddin
0cd2be7c17
am 058835e3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '058835e33d9b078d0a72d150f9483e8aa288e772':
Import translations. DO NOT MERGE
2013-04-12 11:20:28 -07:00
Baligh Uddin
66e3763aa0
Import translations. DO NOT MERGE
...
Change-Id: I15a73679c695e77f03a10c9145c13055fa2472b1
Auto-generated-cl: translation import
2013-04-12 08:55:42 -07:00
Baligh Uddin
51d2a4359b
Import translations. DO NOT MERGE
...
Change-Id: I10fbc89bea48711ace448934bab2aacf6afd9549
Auto-generated-cl: translation import
2013-04-12 08:47:44 -07:00
Svetoslav
3ba01a7cc3
am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
...
* commit '9d02928e4349cecfa14e195d3d6f40e68c5fc468':
Adding APIs for an accessibility service to intercept key events.
2013-04-11 22:51:09 -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
bdd97e02ec
am 3b9e272e: am 83b00258: Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev
...
* commit '3b9e272e0e2f01d55e67c68dbf5b6e9d895508f4':
Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
2013-04-11 21:57:31 -07: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
b97ebedeb3
am dc5711ea: am bf26c9cf: Merge "Ensure looper quits after all other messages are handled." into jb-mr2-dev
...
* commit 'dc5711eaef8662d5299f0088edf6e47fff77a872':
Ensure looper quits after all other messages are handled.
2013-04-11 21:11:08 -07: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
58c15bfcdf
am f6a2503d: am 5adae45a: Merge "Document the behavior of \'null\' values in SharedPreferences" into jb-mr2-dev
...
* commit 'f6a2503d4ad50e22d0e32ade59bb0f73fae5273f':
Document the behavior of 'null' values in SharedPreferences
2013-04-11 18:47:14 -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