16992 Commits

Author SHA1 Message Date
Dianne Hackborn
dd830c2114 am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '6023873463331d30b7ed12942c3323f1b6975ed8':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:40:56 -08:00
Dianne Hackborn
6023873463 am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:37:08 -08:00
Dianne Hackborn
7becaeea7b Another stab at fixing issue #3149290 java.lang.RuntimeException:...
...Unable to pause activity
{com.android.settings/com.android.settings.applications.StorageUse}

Change-Id: Ibfa28a1c5af50dd150dfcafe71e905426d312643
2010-12-22 18:29:32 -08:00
Jeff Brown
182f7950b8 Merge "Enable touch splitting by default for Honeycomb apps." 2010-12-22 18:29:19 -08:00
Jim Miller
7b3724dd30 Merge "Fix 3298264: Update LockScreen DigitalClock with new font" 2010-12-22 17:35:26 -08:00
Jeff Brown
995e774319 Enable touch splitting by default for Honeycomb apps.
Also fixed some bad comments I noticed along the way.

Change-Id: I4328c8aaa22f48a5c1fd274e889abb7823747330
2010-12-22 17:00:33 -08:00
Jeff Brown
eb9f7a01b0 Fix policy issues when screen is off. (DO NOT MERGE)
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
  is not showing (the proximity sensor turned off the screen).
  Previously we passed all non-wake keys through in this case which
  caused a bug on Crespo where the screen would come back on if a soft key
  was held at the time of power off because the resulting key up event
  would sneak in just before the keyguard was shown.  It would then be
  passed through to the dispatcher which would poke user activity and
  wake up the screen.
- We propagate the key flags when broadcasting media keys which
  ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released.  This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Bug: 3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
2010-12-22 16:00:21 -08:00
John Reck
ba5c41212f Fix testGetAllVisitedUrls to match BP1 behavior
Bug: 3306953
 Previously with BrowserProvider1 all bookmarks were considered
 visited URLs. Updated Browser.getAllVisitedUrls to match that behavior
 when using BrowserProvider2

Change-Id: I15e6e4e91af4e7d1b21860aabf4ce5a5c6a9d81e
2010-12-22 15:58:21 -08:00
Jaikumar Ganesh
057898a9b5 Enable Bluetooth reverse tethering.
Change-Id: I84a508b64f18a1445b8ac424f2a36d56ef432375
2010-12-22 15:24:18 -08:00
Jaikumar Ganesh
15c7439acb Add TYPE_BLUETOOTH network interface for reverse tethering.
Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998
2010-12-22 15:24:18 -08:00
Irfan Sheriff
b45e726bf5 Fix wifi broadcasts
Add the missing wifi disable broadcast and also send out
supplicant disconnect on shutdown.

Added unit test cases.

Bug: 3294055

Change-Id: Ia56a8ec9d17784c5aac5b8b369c04837f9057c54
2010-12-22 14:43:13 -08:00
Alon Albert
d41fe75f09 Improved ignore-backoff handling
Allow a non-epidited ignore-backoff op to pass through
an expidited backed off op.

To do this, I first refactored the complicated if statement:

            if (best == null
                    || ((bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry)
                        ? (best.expedited == op.expedited
                           ? opRunTime < bestRunTime
                           : op.expedited)
                        : syncableIsUnknownAndNotARetry)) {
                best = op;
                bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry;
                bestRunTime = opRunTime;
            }

Into a more readable:
            boolean setBest = false;
            if (best == null) {
                setBest = true;
            } else if (bestSyncableIsUnknownAndNotARetry == syncableIsUnknownAndNotARetry) {
                if (best.expedited == op.expedited) {
                    if (opRunTime < bestRunTime) {
                        //  if both have same level, earlier time wins
                        setBest = true;
                    }
                } else {
                    if (op.expedited) {
                        setBest = true;
                    }
                }
            } else {
                if (syncableIsUnknownAndNotARetry) {
                    setBest = true;
                }
            }
            if (setBest) {
                best = op;
                bestSyncableIsUnknownAndNotARetry = syncableIsUnknownAndNotARetry;
                bestRunTime = opRunTime;
            }

The refactoring was all done automatically with IntelliJ to avoid human error
in the conversion.

After verifying this code still behaved as expected including the error
condition in the bug, I added handling for the cases when a non-expidited op
may override an expedited op if certain conditions occur, specificaly, if the
expidited op is backed off and the non-expidited op is not.

Finally, refactored to make it testable and added tests and logging.

Bug: 3128963

Change-Id: I131cbcec6073ea5fe425f6b5aa88ca56c02b6598
2010-12-22 14:40:43 -08:00
Vasu Nori
6f35c0ecba fix all flaky tests to make them work consistently.
Change-Id: I688f7e058511089bec7fa21e972e23780604d98a
2010-12-22 14:35:56 -08:00
Martin Hibdon
760c881a30 Merge "Correctly save Activity's state in saveInstanceState" 2010-12-22 14:08:42 -08:00
Martin Hibdon
6bcda6387f Correctly save Activity's state in saveInstanceState
Prior to this change, saveInstanceState would
call directly to Activity.onSaveInstanceState(),
rather than performSaveInstanceState().
This meant that saveManagdDialogs() was not called,
so Activities running under a LocalActivityManager
do not get their dialogs restored on configuration changes.

Change-Id: Id45110a8716a86958c14f4b1ea5a84c9cdf107f1
2010-12-22 13:05:52 -08:00
Dianne Hackborn
4985874115 Merge "Fix issue #3194697: default orientation for portrait-mode apps on stingray is backward?" 2010-12-22 12:33:40 -08:00
Dianne Hackborn
07f3d66497 Fix issue #3194697: default orientation for portrait-mode apps on stingray is backward?
Change-Id: Ia01963d1dcdda12ef1b4c56af2bd389e5dadbce1
2010-12-22 12:31:31 -08:00
Jeff Hamilton
8e5ba659df am 7a9f17c3: am 3ce86481: Remove canBeFormatted().
* commit '7a9f17c3563be3eb5fc0927e20d9bc7ec09e20c3':
  Remove canBeFormatted().
2010-12-22 12:04:32 -08:00
Jeff Hamilton
7a9f17c356 am 3ce86481: Remove canBeFormatted().
* commit '3ce86481cbde92e2cb6fe3a46cbedd8b2a5c4b48':
  Remove canBeFormatted().
2010-12-22 09:42:16 -08:00
Jeff Hamilton
3ce86481cb Remove canBeFormatted().
It's not easy to determine if this
is possible, so instead apps should
attempt a format and handle errors
in the format request.

Change-Id: I078a208b849e71ef3fb6b5970a9111ece4a2d201
2010-12-22 11:31:21 -06:00
Ben Murdoch
a97ec8dc94 Merge "Create a better placeholder for YT videos when flash is not installed." 2010-12-22 09:04:02 -08:00
Ben Murdoch
0de27439a6 Create a better placeholder for YT videos when flash is not installed.
Only stretch the placeholder image in one dimension. This closer matches
what the desktop browsers seem to do.

Bug: 3125797
Change-Id: Id0a395c4b784d0b7368e1c7ba6544b25903430bb
2010-12-22 16:46:31 +00:00
Chet Haase
f74dcfcf00 Merge "Account for background drawable size changing when lrtb properties change" 2010-12-22 07:12:24 -08:00
Svetoslav Ganov
28104e1de5 3298147 DatePicker dialog does not provide mechanism for specifying range from which to select
Change-Id: Ib5dd7db90ccc5b4d984914c481118049ac3648fe
2010-12-22 03:29:29 -08:00
Jim Miller
d0fd007058 Fix 3298264: Update LockScreen DigitalClock with new font
This updates the font used to show the AM/PM indicator
as well as creating shared colors for DigitalClock components
in all LockScreen layouts.

Change-Id: I87fcba67b421660bddb9b10213ac62704a49b7b9
2010-12-21 22:58:02 -08:00
Chet Haase
55dbb6516d Account for background drawable size changing when lrtb properties change
LayoutTransition may set the left, right, top, bottom properties of a View when
animating it. If the View has a background drawable, and if these properties change
the actual dimensions of the view, then the background drawable must be informed
of the size change in order to display itself correctly.

Change-Id: I8ae47a051b250d0d4bdee97b1f1b5d27fe3f7f8b
2010-12-21 20:15:08 -08:00
Jeff Brown
0099863155 Merge "Add support for forward delete key." 2010-12-21 18:12:33 -08:00
Jeff Brown
14d0ca1473 Add support for forward delete key.
Change-Id: Ib356abddd92db12d6b33e19234136c0d167f0e15
2010-12-21 18:04:26 -08:00
Jeff Brown
67b6ab72ae Add TextView support for Home, End, PageUp, PageDown.
Change-Id: If8aa2a63b5fc33528d54eef68e695082a129acce
2010-12-21 18:03:08 -08:00
Jeff Brown
d1e8e94368 Merge "Support invoking key shortcuts using Control." 2010-12-21 17:41:40 -08:00
Jeff Brown
c1df907e39 Support invoking key shortcuts using Control.
This enables Select All, Cut, Copy and Paste behavior in TextViews
and provides a general pattern for implementing additional keyboard
accelerators based on Control key shortcuts.  The same shortcuts
also apply to menu accelerators.

Bug: 3286262
Change-Id: I7d458ee26abf51e0de1735ce490ce3baf504b471
2010-12-21 17:39:12 -08:00
Jaikumar Ganesh
b9fbc9e92f Fix parameter to Pan Device Call.
Change-Id: I659e47feb56b052c61b7ee5521ffb5be71ce04c2
2010-12-21 17:27:07 -08:00
Jaikumar Ganesh
5200c8ab72 Add EXTRA_LOCAL_ROLE to Pan State change intent.
This will help apps distinguish between reverse and normal tethering.

Change-Id: I5327ad75dc2cbf478e4f7c2cd6ef1dbe8fba9e93
2010-12-21 16:53:43 -08:00
Gilles Debunne
68e8ed38fe Merge "Links are clickable in TextView when textIsSelectable." 2010-12-21 16:10:20 -08:00
Amith Yamasani
25a9ed5331 Merge "No frame and margins for dialog style preference screens." 2010-12-21 14:34:30 -08:00
Amith Yamasani
1d0f0d2ca9 No frame and margins for dialog style preference screens.
Bug: 3246757
2010-12-21 14:33:08 -08:00
Gilles Debunne
f3895edf4b Links are clickable in TextView when textIsSelectable.
Bug 3299410

Change-Id: I921c9eecbfef1d81b0d0e2ad2129400c58f165a1
2010-12-21 13:37:05 -08:00
Dianne Hackborn
20c915d803 am 5261cea2: Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread
* commit '5261cea2e0cd61801e102114039a19ab449b53fe':
  Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.
2010-12-21 13:33:06 -08:00
Dianne Hackborn
5261cea2e0 Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread 2010-12-21 13:27:15 -08:00
Xia Wang
b057c3dbe6 Merge "Few changes for Wi-Fi Stress Test" 2010-12-21 13:13:42 -08:00
Jesse Wilson
63acafec59 Merge "Remove unused performance tests." 2010-12-21 12:22:08 -08:00
Xia Wang
73055f12d7 Few changes for Wi-Fi Stress Test
Add WIFI_IDLE_MS to 1min in Wi-Fi stress test. bug#3284797
Wake up device using PowerManagerService.userActivityWithForce instead
of full wake lock.
Turn screen on when running Wi-Fi tests.

Change-Id: Ib763136cef515eec8b1d25183cf7a84ae1038ef2
2010-12-21 11:31:06 -08:00
Gilles Debunne
32ea4ffdca Fix for ellipsized text that has two lines at maximum.
The breakOnlyAtSpaces test did not include the reset at the end of the loop
which resets j and w (current position and width). As a result, the second line
was too long from the start and never cut again.

Hours a debug, a simple { change.

Bug 2969667

Change-Id: I1e5b4a37cd9e64d115e6343d7788db3a6ef881e0
2010-12-21 11:28:34 -08:00
Dianne Hackborn
d69313da4c Merge "Fix issue #3301572: onCreateLoader must not be a member class: VolumeMetadataLoader" 2010-12-21 11:15:39 -08:00
Dianne Hackborn
0e3b8f421d Fix issue #3301572: onCreateLoader must not be a member class: VolumeMetadataLoader
Also some various cleanup.

Change-Id: I8e8616a86c50c86817f7ec9bb02a5954c1ccd84f
2010-12-21 11:12:09 -08:00
Jesse Wilson
bd1c5da28d Remove unused performance tests.
Change-Id: I5a252e314831716f99ce5fbb32d983c7473ee787
2010-12-21 10:23:28 -08:00
Vasu Nori
34884643b6 Merge "resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9" 2010-12-21 10:12:16 -08:00
Vasu Nori
34ad57f0e8 resubmitting Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9
Change-Id: I67b1d04a5c9fc18b0cd4da6184d0b814b64d89e9 was reverted
due to a bug. fixed the bug and resubmitting it here
2010-12-21 09:32:36 -08:00
Kristian Monsen
41e7e6f933 Retrying sending proxy changes to webkit
Now checking if the ProxyProperties object is null, and if the
string returned by getHost() is null.

Change-Id: I727e26c2a41fe057501c3b610ba6fa221d16da45
2010-12-21 14:32:35 +00:00
Ola Olsson
145e6c4975 The phone is crashing when unknown mime content is transferred.
The content resolver does not take care of the IllegalStateException
that is thrown in getType and that needs to be fixed.

Change-Id: I3e66f1aa259ab91fb9233e1ba07faa1ab6c3f2dd
2010-12-21 08:52:22 +01:00