7217 Commits

Author SHA1 Message Date
Jaikumar Ganesh
aafff8a069 Add a new priority for Auto Connection of A2DP.
1. PRIORITY_OFF is when user unchecks A2DP connection profile box.
2. By default, when you bond, it will be PRIORITY_ON.
3. When the profile gets connected, the priority gets set to
   PRIORITY_AUTO_CONNECT. This means that we will connect
   automatically to this profile.
4. When the user disconnects, we downgrade the priority to PRIORITY_ON,
   which means we won't reconnect automatically.

a) We need to make a similar change to Handsfree profile.
b) We need to rework the profile management design and code which
  will fix the 6 second timer that we have for A2DP reconnection.
2009-11-24 15:05:37 -08:00
Jim Miller
6dec1f60ae am f8da578e: resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp
Merge commit 'f8da578ee7d398f21e002947505cddf827937a98'

* commit 'f8da578ee7d398f21e002947505cddf827937a98':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:47:02 -08:00
Jim Miller
f8da578ee7 resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp 2009-11-24 14:31:37 -08:00
Jim Miller
a442e79126 am 35cdb484: Merge change I6c6c166b into eclair
Merge commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-mr2

* commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:04:44 -08:00
Android (Google) Code Review
35cdb48492 Merge change I6c6c166b into eclair
* changes:
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:00:54 -08:00
Android (Google) Code Review
e76ec9b216 Merge change Ibe6f3705
* changes:
  Encrypted File Systems Project. Installer modifications. Started to modify isntaller for data redirection to a secure location.
2009-11-24 13:39:37 -08:00
Oscar Montemayor
a8529f6867 Encrypted File Systems Project. Installer modifications.
Started to modify isntaller for data redirection to a secure location.
2009-11-24 11:44:19 -08:00
Fred Quintana
5bb9771ec7 resolved conflicts for merge of b8675943 to master 2009-11-24 11:39:32 -08:00
Trevor Johns
d240b7489a am 0d2feb0d: am 82d4b5cc: am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '0d2feb0d7355e6bb6235053a162aa8d6b770deeb'

* commit '0d2feb0d7355e6bb6235053a162aa8d6b770deeb':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 11:07:24 -08:00
Fred Quintana
b867594323 am 2464acc6: moved the gdata library to vendor/google
Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp

* commit '2464acc6da6393f0163894094468f68b8e496cea':
  moved the gdata library to vendor/google
2009-11-24 11:03:05 -08:00
Fred Quintana
2464acc6da moved the gdata library to vendor/google 2009-11-24 10:42:00 -08:00
Trevor Johns
0d2feb0d73 am 82d4b5cc: am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp

* commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:45:09 -08:00
Trevor Johns
82d4b5ccaf am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:40:19 -08:00
Android (Google) Code Review
99f7b56fbe Merge change Iefdb6f97 into eclair
* changes:
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:35:35 -08:00
Leon Scroggins
5ec498b39c am 62776524: am ecfc0eba: Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit '627765245bb89bc590a1cecaaf935414f076618b'

* commit '627765245bb89bc590a1cecaaf935414f076618b':
  Fix soft keyboard dismissing itself when zooming into a textfield in browser.
2009-11-24 06:34:56 -08:00
Leon Scroggins
627765245b am ecfc0eba: Fix soft keyboard dismissing itself when zooming into a textfield in browser.
Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp

* commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
  Fix soft keyboard dismissing itself when zooming into a textfield in browser.
2009-11-24 06:29:17 -08:00
Leon Scroggins
ecfc0eba60 Fix soft keyboard dismissing itself when zooming into a textfield in browser.
We remove the WebTextView while zooming.  If the WebTextView ended up
offscreen, we remove it completely, thus hiding the IME.  In some cases,
however, the WebTextView is only offscreen because the IME overlapped it.
Check to see if the IME is showing, and if so, adjust the WebTextView and
let it get scrolled into view.

Also perform the removal/change in text size inside the method, so it
happens in both places.

Lastly, do not call didUpdateTextViewBounds if there is no WebTextView.

Fix for http://b/issue?id=2266066
2009-11-24 09:21:48 -05:00
Ben Murdoch
0187e9ec40 Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
BUG=b/2271636

This has already been submitted to eclair-mr2.

Change-Id: I81947f671f58be006ee3e1b30d73c6cb6cf2ebee
2009-11-24 12:32:02 +00:00
Ben Murdoch
545a2a12c1 Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
This has already been submitted to eclair-mr2.

Change-Id: Ibd184157a90b0031141c91c3b3bbbf4ef86e44e4
2009-11-24 12:31:37 +00:00
Steve Block
357997dd4a Improves documentation for GeolocationPermissions class. Do not merge.
Also sets an explicit type for GeolocationPermissions.getOrigins.

This is a partial fix for bug http://b/issue?id=2271636

This has already been submitted to eclair-mr2.

Change-Id: I0c77eca94eb56d16c2a9a29a72eb221e4a7a52a6
2009-11-24 12:27:50 +00:00
Dan Egnor
0257fec32d am 82fa9c46: am b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9'

* commit '82fa9c46cfccfc0955aeb5b18ff56ebf0d7312a9':
  Expand db_operation logging to prepare for widespread sample collection:
2009-11-23 19:20:15 -08:00
Dan Egnor
82fa9c46cf am b59573cf: Merge change I06fb08c4 into eclair-mr2
Merge commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp

* commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983':
  Expand db_operation logging to prepare for widespread sample collection:
2009-11-23 19:14:23 -08:00
Dan Egnor
12311959c6 Expand db_operation logging to prepare for widespread sample collection:
- always enable the log, but subsample for queries faster than 100ms
- add information about whether it's blocking a main thread
- log the entire sql (have not yet added quoted-string-stripping)
2009-11-23 18:26:14 -08:00
Jim Miller
6c6c166bf4 Fix 2268841: Updated portrait tab lockscreen to match latest PPL. 2009-11-23 18:21:51 -08:00
Fred Quintana
be62ddd4ee resolved conflicts for merge of eb393ce8 to master 2009-11-23 15:36:25 -08:00
Fred Quintana
eb393ce8ee am 4174016d: Merge change I53e3a20e into eclair-mr2
Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp

* commit '4174016dbd043eda493e9cd1925ed84549c7b3c0':
  move SubscribedFeeds to GSF
2009-11-23 13:47:00 -08:00
Android (Google) Code Review
4174016dbd Merge change I53e3a20e into eclair-mr2
* changes:
  move SubscribedFeeds to GSF
2009-11-23 13:42:24 -08:00
Mike Lockwood
4ddc2ed883 am fa351d38: am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'fa351d388d0441432f4e616ef87a5c97a088dd04'

* commit 'fa351d388d0441432f4e616ef87a5c97a088dd04':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:18:19 -08:00
Fred Quintana
53e3a20e41 move SubscribedFeeds to GSF 2009-11-23 13:18:07 -08:00
Mike Lockwood
fa351d388d am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp

* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:13:39 -08:00
Android (Google) Code Review
e5683369d2 Merge change I60dfecdc into eclair-mr2
* changes:
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 12:20:04 -08:00
Grace Kloba
543d9ca0cc am f40abf42: am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'f40abf427e614b850dfb3723622af3e6039a9815'

* commit 'f40abf427e614b850dfb3723622af3e6039a9815':
  Expose some debugging tools of the WebView.
2009-11-23 12:17:33 -08:00
Mike Lockwood
fb73f79340 Add window manager support for overriding button and keyboard backlight values.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field

Needed for bugs:
    b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
    b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)

Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
2009-11-23 15:16:55 -05:00
Grace Kloba
f40abf427e am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp

* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
  Expose some debugging tools of the WebView.
2009-11-23 12:12:52 -08:00
Android (Google) Code Review
ed1624d8ff Merge change I8ae1b41a into eclair-mr2
* changes:
  Expose some debugging tools of the WebView.
2009-11-23 12:07:20 -08:00
Android (Google) Code Review
9854deae10 Merge change I1691f3d3 into eclair
* changes:
  Add CPUFREQ_STATS event tag DO NOT MERGE
2009-11-23 11:57:08 -08:00
Grace Kloba
8ae1b41a43 Expose some debugging tools of the WebView. 2009-11-23 10:35:34 -08:00
Daniel Sandler
4063b4d1cf am 0182aa35: am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '0182aa354f996ce43362cd7d1a04012ea9269f41'

* commit '0182aa354f996ce43362cd7d1a04012ea9269f41':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:55:21 -08:00
Daniel Sandler
0182aa354f am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp

* commit '40c1dbf081035f878b96dd67ef112eb49001c087':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:50:12 -08:00
Daniel Sandler
40c1dbf081 am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2

* commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:44:27 -08:00
Android (Google) Code Review
a59a01ab2b Merge change I43f72dd1 into eclair
* changes:
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:39:24 -08:00
Jaikumar Ganesh
4f4fdf6dc3 am 09e27c4a: am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3'

* commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3':
  Fix pairings lost on reboot.
2009-11-22 22:17:07 -08:00
Jaikumar Ganesh
09e27c4a9c am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp

* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
  Fix pairings lost on reboot.
2009-11-22 22:10:15 -08:00
Jaikumar Ganesh
8631e55425 am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
  Fix pairings lost on reboot.
2009-11-22 22:02:17 -08:00
Android (Google) Code Review
ad431ad863 Merge change Ia3acc2ee into eclair
* changes:
  Fix pairings lost on reboot.
2009-11-22 21:54:29 -08:00
Dan Egnor
1691f3d3e8 Add CPUFREQ_STATS event tag
DO NOT MERGE
2009-11-21 11:11:09 -08:00
Daniel Sandler
f60e108fa9 Don't block TIME_TICK broadcasts in the DigitalClock widget.
This change applies the fix -- originally by phanna in
https://android-git.corp.google.com/g/#change,33669 -- to
the com.android.internal.widget version of DigitalClock,
which is used by the keyguard and pattern lock screens.

Change-Id: I43f72dd144423e55f73ba52903d52163c8f65591
2009-11-20 19:55:07 -05:00
Dianne Hackborn
5d3ac273b0 am 131a5ee9: am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '131a5ee9aeadb9057847a437a669dd61573f5c88'

* commit '131a5ee9aeadb9057847a437a669dd61573f5c88':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:54:36 -08:00
Dianne Hackborn
131a5ee9ae am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp

* commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:49:21 -08:00
Dianne Hackborn
dbf3d3acc1 am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2

* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:43:20 -08:00