Brad Fitzpatrick
38051bc018
am 6a15f0d7: am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
...
Merge commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023'
* commit '6a15f0d7c7ed74e086f4d3a7014ed724a2b18023':
Quiet unnecessary debug logging.
2010-10-10 11:16:16 -07:00
Gilles Debunne
441d198023
am 5e3329b5: am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
...
Merge commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4'
* commit '5e3329b5fac117ed49c9c3ca2919a4b1533612c4':
Removed unused and broken screen_progress
2010-10-10 11:15:28 -07:00
Brad Fitzpatrick
71ce18b0b7
am b8d40d26: am 30f5c8fe: More DropBoxManager javadoc love.
...
Merge commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321'
* commit 'b8d40d263bc18d1defc1e6980e8f922df8f8f321':
More DropBoxManager javadoc love.
2010-10-10 11:15:12 -07:00
Brad Fitzpatrick
ceda3a972c
am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
...
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'
* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
DropBox.Entry javadoc syntax fix
2010-10-10 11:14:56 -07:00
Jean-Baptiste Queru
264c2cfe4d
resolved conflicts for merge of 5df4b5a7 to master
...
Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2
2010-10-10 11:09:45 -07:00
Wu-cheng Li
e1199e382f
am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread
...
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'
* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
Add javadoc for display orientation.
2010-10-08 18:28:38 -07:00
Adam Powell
d856b1ce92
resolved conflicts for merge of 86b50028 to master
...
Change-Id: I3468e67ac17f861c5491717337c27cd49bd5287e
2010-10-08 18:23:49 -07:00
Dianne Hackborn
ca33268ef8
am 18e225b4: am bfba7cab: Fix issue #3001362 : API REVIEW: android.view.InputQueue.Callback
...
Merge commit '18e225b42b77c48efa63f245a4137c5f74302e26'
* commit '18e225b42b77c48efa63f245a4137c5f74302e26':
Fix issue #3001362 : API REVIEW: android.view.InputQueue.Callback
2010-10-08 17:59:52 -07:00
Dianne Hackborn
d7dccd2611
am 55f1b0b8: am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
...
Merge commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f'
* commit '55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f':
Make Activity.removeDialog() less strict.
2010-10-08 17:58:35 -07:00
Kenny Root
06f89ca9b1
am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
...
Merge commit '36455d03256024981b1bf21557722a010b5e092a'
* commit '36455d03256024981b1bf21557722a010b5e092a':
Add MountService tests and fix a bug it found
2010-10-08 17:57:55 -07:00
Dianne Hackborn
fa9921e4bc
am e89bf502: am ef083ec0: Merge "Work on issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
...
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'
* commit 'e89bf50261902bf263887923bf95595ec8eae069':
Work on issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-08 17:57:35 -07:00
Adam Powell
54ca811b29
Merge "Fix alert dialog layout size in landscape"
2010-10-08 17:10:24 -07:00
Adam Powell
4fb17b0490
Fix alert dialog layout size in landscape
...
Change-Id: Iff5c388655c357e78c0c0e98d718fb7601c2d543
2010-10-08 17:04:39 -07:00
Amith Yamasani
0594476ffa
SearchView: Add some more listeners, IME dismiss improvements and focus control.
...
Addresses following bugs:
3067611 : Submit button incorrectly displayed
3064371 : Callback to report suggestion click
3008580 : Setting initial focus
The SearchView will take initial focus now, reverting an earlier change. If
you don't want it to take initial focus, then you must requestFocus on a
different view on launching the activity, since the initial focus is desirable
in other cases. This is normal behavior for all EditText widgets and SearchView
shouldn't have a different behavior.
2010-10-08 15:49:37 -07:00
Mike Dodd
9568a5ab2e
Merge "HardwareRenderer: When throwing an exception because of an EGL error, include the specific error."
2010-10-08 15:33:45 -07:00
Vasu Nori
ee7e28e20d
Merge "when printing requery on UI warning, include additional info"
2010-10-08 14:50:59 -07:00
Vasu Nori
f0808f810e
when printing requery on UI warning, include additional info
...
this hsould help figure out which module is doing query on UI thread.
Change-Id: If3062a35fa1fb50063b678c3c9311d6b1504fa9b
2010-10-08 14:48:48 -07:00
Mike Dodd
5d3e2ea6f3
HardwareRenderer: When throwing an exception because of an EGL
...
error, include the specific error.
Change-Id: I8e4b0cdbc207824df4f4bb55c3b379b0ee4aeec2
2010-10-08 14:43:16 -07:00
Irfan Sheriff
8163315095
Merge "Use LinkProperties for IP and proxy configuration"
2010-10-08 14:09:49 -07:00
Adam Powell
c459622dd1
Merge "Holo theme progress and assets!"
2010-10-08 13:52:55 -07:00
Joe Onorato
481bbb9c11
Merge "Get rid of the global actions menu on tablets."
2010-10-08 13:29:37 -07:00
Joe Onorato
d208e70926
Get rid of the global actions menu on tablets.
...
We have the system tray for that stuff. Make long press on power
go directly to the shut down confirmation dialog. Make that dialog
auto dismiss when the screen goes off. Reword it when we're skipping
the global actions menu, because it feels too abrupt to say "The
phone will shut down" when they haven't clearly pressed a button
that says shut down.
Change-Id: I8c92a1362bd4ed242e6cd94c2dae6d9ff9c4c34d
2010-10-08 16:28:05 -04:00
Adam Powell
2fbf4de64f
Holo theme progress and assets!
...
* Light and dark dialogs
* Checkboxes and radio buttons
* Toggle buttons
Warning! This is still a work in progress. This does not include final metrics.
Some assets (specifically dialogs) are currently misaligned.
2010-10-08 13:25:17 -07:00
Irfan Sheriff
96ca91761e
Use LinkProperties for IP and proxy configuration
...
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
2010-10-08 12:41:11 -07:00
Dianne Hackborn
c4dfe3d5c0
am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
...
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'
* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
Fix NPE if there is no accelerometer.
2010-10-08 12:39:14 -07:00
Dianne Hackborn
a1b0d6966e
resolved conflicts for merge of efa4f7f8 to master
...
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
2010-10-08 11:09:38 -07:00
Fred Quintana
c6a69559cb
Add getCurrentSyncs() to the SDK, which replaces the deprecated
...
getCurrentSync().
Change-Id: I1112df41e48ed93ff4c0c5af4825dbdce0c4cccc
2010-10-08 09:50:45 -07:00
Gilles Debunne
fdcd2660ec
Merge "resolved conflicts for merge of ba04dbc6 to master"
2010-10-08 09:20:57 -07:00
Patrick Scott
5fe721f5f5
Fix NPE in addMessageToConsole.
...
CallbackProxy should always check for client during handleMessage.
Bug: 3060412
Change-Id: I0a84fa2ce21cc46d9b215b18a700119c7c12a7f2
2010-10-08 10:06:07 -04:00
Gilles Debunne
cf1e925aa1
resolved conflicts for merge of ba04dbc6 to master
...
Change-Id: I175aa21ef01b98b0c3c46aea0b754d14984128b9
2010-10-07 20:46:03 -07:00
Brad Fitzpatrick
6a15f0d7c7
am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
...
Merge commit '6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp
* commit '6275dbbea8ad7bde984a362516654004e111dc67':
Quiet unnecessary debug logging.
2010-10-07 14:02:10 -07:00
Gilles Debunne
5e3329b5fa
am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
...
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp
* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
Removed unused and broken screen_progress
2010-10-07 14:01:48 -07:00
Brad Fitzpatrick
b8d40d263b
am 30f5c8fe: More DropBoxManager javadoc love.
...
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp
* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
More DropBoxManager javadoc love.
2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
992a9e507f
am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
...
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp
* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
DropBox.Entry javadoc syntax fix
2010-10-07 14:01:30 -07:00
John Wang
5df4b5a78b
am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
...
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp
* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Chet Haase
6a5fc4bc62
Merge "New TimeInterpolator interface for android.animation package."
2010-10-07 13:18:36 -07:00
Chet Haase
e0ee2e9f31
New TimeInterpolator interface for android.animation package.
...
The new animation package's reliance on the old Interpolator interface (in
android.view.animation) was an eyesore. Adding TimeInterpolator, and having the
old Interpolator interface extend it, allows the new Animator classes to break
the tie to the older animation package completely. However, developers can still
use the older Interpolator-based classes, such as AccelerateInterpolator,
because they all implicitly extend the new TimeInterpolator class.
Change-Id: I41132fa56167ba564f4839113289114d0ea31a92
2010-10-07 12:27:06 -07:00
Dianne Hackborn
8c4e779a4c
am e112b744: am 930d6c3c: Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
...
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'
* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
Fix issue #3056500 : Problem report for ASTRO
2010-10-07 12:22:14 -07:00
Kenny Root
c5610a4c13
am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
...
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'
* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Brad Fitzpatrick
6275dbbea8
Merge "Quiet unnecessary debug logging." into gingerbread
2010-10-07 11:27:56 -07:00
Brad Fitzpatrick
90bc5ee02b
Quiet unnecessary debug logging.
...
Change-Id: I46d8aff5790db371d60b2066acbbdd55cfad8074
2010-10-07 11:26:57 -07:00
Joe Onorato
7d56e3d3cb
Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached."
2010-10-07 10:52:30 -07:00
Gilles Debunne
e86a6b2a4d
Merge "Removed unused and broken screen_progress" into gingerbread
2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
30f5c8fede
More DropBoxManager javadoc love.
...
Change-Id: I9b14f6905533e0af66bd64fc76352ed8fc365058
2010-10-07 10:48:20 -07:00
Brad Fitzpatrick
95173b14d6
DropBox.Entry javadoc syntax fix
...
Change-Id: I32d055b39ca89ec9f6a7bf189263844424533b60
2010-10-07 10:07:34 -07:00
John Wang
08fb5851bb
Merge "Add flag to skip restoring network seletion." into gingerbread
2010-10-07 09:47:01 -07:00
John Wang
35c4c211e0
Add flag to skip restoring network seletion.
...
For bug 3045366.
Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
2010-10-07 09:44:19 -07:00
Eric Rowe
82aacddef9
am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
...
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp
* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
DO NOT MERGE Initialize bluetooth profiles in BT stress tests
2010-10-07 09:19:37 -07:00
Eric Rowe
f8d2acdc57
Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
2010-10-07 09:06:30 -07:00
Eric Rowe
8bcc744e1b
DO NOT MERGE Initialize bluetooth profiles in BT stress tests
...
Change-Id: I0a8b75c8686d9d6969db51d618c1ddeacb2aba87
2010-10-07 18:01:23 +02:00