Dianne Hackborn
abdbc53db6
Merge "The return of rawbu. For other nefarious purposes."
2010-03-11 21:44:48 -08:00
Kenny Root
b001e99f67
Merge "Add correct copyright headers to multiple files"
2010-03-11 21:23:51 -08:00
Marc Blank
23e1e31e4c
Merge "Add ORGANIZER_CAN_RESPOND to Calendars column"
2010-03-11 20:32:26 -08:00
Adam Powell
ccefbe4493
Merge "Tame some monkeys"
2010-03-11 20:16:36 -08:00
Ray Chen
a708d1ebdb
Merge "Add GPSProcessingMethod tag to ExifInterface."
2010-03-11 19:54:52 -08:00
Kenny Root
bd393b7f39
Add correct copyright headers to multiple files
...
Format for the list of changes shows the origin commit reference followed
by the file name.
33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java
Copyright header moved to top in following file:
core/tests/coretests/src/android/widget/ListViewTest.java
Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
2010-03-11 18:22:10 -08:00
Romain Guy
b04de526b7
Merge "Preserve widgets on upgrade. Bug #2464545 "
2010-03-11 18:14:23 -08:00
Kenny Root
661a6826eb
Merge "Add copyright header for new file"
2010-03-11 17:45:38 -08:00
Roy West
d6d456b287
Merge "Second of three sets of minor edits for SD card storage text."
2010-03-11 17:29:32 -08:00
Robert Greenwalt
f8c309d7fc
Merge "Stop creating threads for tethering."
2010-03-11 17:21:12 -08:00
Dianne Hackborn
1a50ab420b
Merge "Need to keep new package's cert when using original-package."
2010-03-11 17:12:48 -08:00
Adam Powell
5fe8399d3c
Merge "Fix tap detection after a long press"
2010-03-11 16:33:58 -08:00
Ken Shirriff
16da45d917
Merge "Close db statement."
2010-03-11 16:16:43 -08:00
Tom Taylor
e65545bc78
Merge "Add a new meta_data column"
2010-03-11 15:58:49 -08:00
Vasu Nori
b994f140ed
Merge "debug-flag covered log messages to help people debug finalizer stuff"
2010-03-11 15:51:32 -08:00
Romain Guy
5e3b258281
Merge "Support old/new package names for widgets."
2010-03-11 15:41:22 -08:00
Dianne Hackborn
e651f38757
Merge "Fix issue #2461567 : Home screen redraw messed up"
2010-03-11 15:13:15 -08:00
Mathias Agopian
87d968a91b
Merge changes Id4ca8ef7,I1021c590
...
* changes:
implement connect/disconnect in our native_window_t implementations
Add a new connect/disconnect API to android_native_window_t
2010-03-11 15:10:16 -08:00
Mathias Agopian
55fa25161a
implement connect/disconnect in our native_window_t implementations
...
the framebuffer implementation doesn't do anything special with this
but the surfaceflinger implementation makes sure the surface is not used
by two APIs simultaneously.
Change-Id: Id4ca8ef7093d68846abc2ac814327cc40a64b66b
2010-03-11 15:06:54 -08:00
Mathias Agopian
e156e6478f
Add a new connect/disconnect API to android_native_window_t
...
it's used to keep track of which API owns the surface.
Change-Id: I1021c5905c020efc3c428e561b38189377168b22
2010-03-11 15:05:52 -08:00
Adam Powell
21b50efa6f
Merge "Fix overscroll distance calculation for stack-from-bottom ListViews"
2010-03-11 15:01:56 -08:00
Marco Nelissen
6dbaa59564
Merge "Revert "Do autodetection even if no locale was specified, and use the""
2010-03-11 14:56:54 -08:00
Joe Onorato
49b2fdce2f
Merge "Throw a better error message when the automatic onClick handling doesn't work."
2010-03-11 14:55:23 -08:00
Wink Saville
da5618d6e6
Merge "Ignore instead of throw errors in QuittingState and reorder some parameters."
2010-03-11 14:43:06 -08:00
John Wang
8be757638e
Merge "Make getCellLocation return null if not available."
2010-03-11 13:56:59 -08:00
Mathias Agopian
d129659347
fix [2483456] Video orientation is wrong on Droid for some videos
...
Change-Id: I450191f1335f57bffc51aff3e27295395847dbc0
2010-03-11 12:55:39 -08:00
San Mehat
06cc3e1b5d
Merge "MountService: If USB cable is unplugged while UMS is active, clean up and remount"
2010-03-11 12:23:50 -08:00
Daniel Sandler
f6f1f2ac0e
Merge "Javadoc fix."
2010-03-11 12:23:50 -08:00
Wink Saville
4d5771e57f
Merge "Add quit and fix HSM EBNF."
2010-03-11 12:15:20 -08:00
Patrick Scott
c6e2635cb4
Merge "Do not send the not-modified response when validating the cache."
2010-03-11 11:47:22 -08:00
Grace Kloba
c6e84ec22a
Merge "Implement smart-zoom per Adobe request."
2010-03-11 11:43:56 -08:00
Vasu Nori
f587bf2f08
Merge "add more debug info to SQL section in bugreport"
2010-03-11 11:42:45 -08:00
Daniel Sandler
18e498167c
Merge "Turn off pulsing jogball while on a call."
2010-03-11 11:24:47 -08:00
Doug Zongker
07bb5c4cf9
Merge "make RecoverySystem.verifyPackage interruptible"
2010-03-11 11:15:53 -08:00
Adam Powell
4bc9ad16dd
Merge "Make paging touch slop smaller"
2010-03-11 10:30:01 -08:00
Nicolas Catania
05c4d2a1d8
Merge "Allow invoke in all the player states except idle and error."
2010-03-11 10:26:36 -08:00
Adam Powell
021cc891a7
Merge "Let ListView overscroll header/footer attributes take a color"
2010-03-11 10:20:22 -08:00
Mike LeBeau
4dceb65c9b
Merge "Add a voice search hint context for the launcher."
2010-03-11 10:15:03 -08:00
Mike LeBeau
7009469db8
Add a voice search hint context for the launcher.
...
Change-Id: If22471517d8ee34b750278666277d50deaf9ce47
2010-03-11 10:14:16 -08:00
Mike LeBeau
572843e47d
Merge "Fix a variable name reference in Activity docs."
2010-03-11 09:22:18 -08:00
Fabrice Di Meglio
0a85e75367
Merge "Fix bug #2493102 (Sync keeps getting stuck, or at least very slow)"
2010-03-11 09:20:57 -08:00
Andreas Huber
8ef5c637dd
Merge "Reduce buffer sizes related to HTTP media data transfer in order to reduce the probability of a connection timeout/reset due to long periods of time between socket activity."
2010-03-11 09:14:45 -08:00
Nicolas Catania
eb19523db2
Merge "Allow invoke in all the player states except idle and error."
2010-03-11 07:56:18 -08:00
Ben Murdoch
539ec11f1e
Merge "Check if the JS_ENGINE key exists as an environment variable before reading it."
2010-03-11 05:46:28 -08:00
Steve Block
135cc84a90
Merge "Remove http/wml from the DumpRenderTree skipped list, as this directory no longer exists."
2010-03-11 03:08:38 -08:00
Romain Guy
0d40235dfe
Merge "Fix the build."
2010-03-10 22:12:27 -08:00
Yu Shan Emily Lau
0a4b5b2439
Merge "Modified the expected metadata result as the behavior of Stagefright."
2010-03-10 19:11:38 -08:00
Eric Fischer
7d798277cb
Merge "Don't break lines in the middle of a smiley or other graphic replacement."
2010-03-10 17:59:48 -08:00
Robert Greenwalt
033d5f0e61
Merge "Disable USB Tethering when UMS is active"
2010-03-10 17:24:46 -08:00
Amith Yamasani
f9e73cd423
Merge "Fixing bug 2411394 - Monkey crash due to incorrect test service manifest"
2010-03-10 17:02:40 -08:00
