9526 Commits

Author SHA1 Message Date
Mike LeBeau
c48869e4d0 am 00de43e0: am ca488232: Merge change 26104 into eclair
Merge commit '00de43e0a72b954497596b6053123e5ea54a7ed0'

* commit '00de43e0a72b954497596b6053123e5ea54a7ed0':
  Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle.
2009-09-20 20:36:25 -07:00
Mike LeBeau
00de43e0a7 am ca488232: Merge change 26104 into eclair
Merge commit 'ca4882322f25c95786383df18f843bc688e03351' into eclair-plus-aosp

* commit 'ca4882322f25c95786383df18f843bc688e03351':
  Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle.
2009-09-20 20:31:28 -07:00
Android (Google) Code Review
ca4882322f Merge change 26104 into eclair
* changes:
  Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle. We had discussed doing this in Donut but looks like it never happened. We need these attributes for voice search so now's as good a time as any.
2009-09-20 23:23:25 -04:00
Mike LeBeau
894bedacc4 Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle.
We had discussed doing this in Donut but looks like it never happened. We need these
attributes for voice search so now's as good a time as any.

Followup CL to 25911.
2009-09-20 20:21:48 -07:00
Christopher Tate
f3ea558d8c am 752e5500: am e705ca96: Merge change 26103 into eclair
Merge commit '752e55006f6bdc35781111c7735b97fd6fb1e15d'

* commit '752e55006f6bdc35781111c7735b97fd6fb1e15d':
  Handle restore of the original naive wallpaper backup schema
2009-09-20 20:08:31 -07:00
Christopher Tate
752e55006f am e705ca96: Merge change 26103 into eclair
Merge commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7' into eclair-plus-aosp

* commit 'e705ca961f6c4f76f5b403d8556ee38305553aa7':
  Handle restore of the original naive wallpaper backup schema
2009-09-20 19:58:24 -07:00
Android (Google) Code Review
e705ca961f Merge change 26103 into eclair
* changes:
  Handle restore of the original naive wallpaper backup schema
2009-09-20 22:49:44 -04:00
Christopher Tate
7c2bb66db7 Handle restore of the original naive wallpaper backup schema 2009-09-20 19:47:46 -07:00
Jaikumar Ganesh
f751881fdb am 4fe6f603: am 718970bc: Merge change 26061 into eclair
Merge commit '4fe6f603cafd2f1b54051809182c308a4077b783'

* commit '4fe6f603cafd2f1b54051809182c308a4077b783':
  Send the UUID intent even if apps have not requested for it.
2009-09-20 17:51:57 -07:00
Jaikumar Ganesh
4fe6f603ca am 718970bc: Merge change 26061 into eclair
Merge commit '718970bcf35252451ae15a326bd897b436ba93f3' into eclair-plus-aosp

* commit '718970bcf35252451ae15a326bd897b436ba93f3':
  Send the UUID intent even if apps have not requested for it.
2009-09-20 17:42:29 -07:00
Android (Google) Code Review
718970bcf3 Merge change 26061 into eclair
* changes:
  Send the UUID intent even if apps have not requested for it.
2009-09-20 20:36:54 -04:00
Mathias Agopian
40dedc6a54 am 3b7868c9: am c6a22bef: Merge change 26081 into eclair
Merge commit '3b7868c9b754ab0f908114456c23bee64266e5b5'

* commit '3b7868c9b754ab0f908114456c23bee64266e5b5':
  workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-20 17:28:07 -07:00
Amith Yamasani
2f55de1e8e am 09481271: am 5ea916b1: Merge change 26050 into eclair
Merge commit '09481271507cfac0db2f27b878f4a453ed919fb1'

* commit '09481271507cfac0db2f27b878f4a453ed919fb1':
  Track CPU speed stepping to get more accurate CPU cost per app.
2009-09-20 17:18:15 -07:00
Mathias Agopian
3b7868c9b7 am c6a22bef: Merge change 26081 into eclair
Merge commit 'c6a22beff2af0590c1d76342bf57853f2bc85ff8' into eclair-plus-aosp

* commit 'c6a22beff2af0590c1d76342bf57853f2bc85ff8':
  workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-20 17:18:05 -07:00
Wu-cheng Li
8f7bd3031a am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.
Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684'

* commit 'cd3a02425179ea881f3534d687c143a2ce683684':
  Unhide Camera lock and unlock API.
2009-09-20 17:18:03 -07:00
Android (Google) Code Review
c6a22beff2 Merge change 26081 into eclair
* changes:
  workaround for [2113743] Sholes: frozen then runtime restart going to list view
2009-09-20 20:12:30 -04:00
Amith Yamasani
0948127150 am 5ea916b1: Merge change 26050 into eclair
Merge commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3' into eclair-plus-aosp

* commit '5ea916b17cf0071f4d49936a370f4b873e4eb3e3':
  Track CPU speed stepping to get more accurate CPU cost per app.
2009-09-20 17:08:53 -07:00
Mathias Agopian
4a06bb4f33 workaround for [2113743] Sholes: frozen then runtime restart going to list view 2009-09-20 17:08:45 -07:00
Wu-cheng Li
cd3a024251 am ffe1cf25: Unhide Camera lock and unlock API.
Merge commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c' into eclair-plus-aosp

* commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c':
  Unhide Camera lock and unlock API.
2009-09-20 17:08:44 -07:00
Android (Google) Code Review
5ea916b17c Merge change 26050 into eclair
* changes:
  Track CPU speed stepping to get more accurate CPU cost per app.
2009-09-20 19:59:16 -04:00
Jaikumar Ganesh
330eafe792 am a382a4b0: am 2092361d: Maintain pending outgoing bonding address.
Merge commit 'a382a4b0afd034ba6fd0f316b8ba34bb08fdec60'

* commit 'a382a4b0afd034ba6fd0f316b8ba34bb08fdec60':
  Maintain pending outgoing bonding address.
2009-09-20 16:40:27 -07:00
Jaikumar Ganesh
a382a4b0af am 2092361d: Maintain pending outgoing bonding address.
Merge commit '2092361d586a20190c9137fb3cc9434cdc9ec99f' into eclair-plus-aosp

* commit '2092361d586a20190c9137fb3cc9434cdc9ec99f':
  Maintain pending outgoing bonding address.
2009-09-20 16:30:39 -07:00
Wu-cheng Li
ffe1cf251a Unhide Camera lock and unlock API. 2009-09-21 07:28:44 +08:00
Mathias Agopian
dca2a05912 am be4d7d24: am cc7f40a8: Merge change 26060 into eclair
Merge commit 'be4d7d2446c14ade485f58bbfa451bb969d3c3a4'

* commit 'be4d7d2446c14ade485f58bbfa451bb969d3c3a4':
  log an error when loading an existing GL driver fails
2009-09-20 16:20:48 -07:00
Jaikumar Ganesh
6179965e85 Send the UUID intent even if apps have not requested for it.
This will help apps listening to this intent to update icons etc
if the remote uuid changes. For example, the settings app used to
refresh the icons when the class bits change. It can do it now
when the remote ends uuids changes too.

Change-Id: Ib9af45780e83118d8877b0ef16f5b39b87fb4bef
2009-09-20 16:16:08 -07:00
Jaikumar Ganesh
2092361d58 Maintain pending outgoing bonding address.
This helps us to distinguish between incoming and outgoing Bonding requests.

Change-Id: I69e6a269b7dd6aad60e6f5711cad812291a7d313
2009-09-20 16:16:08 -07:00
Mathias Agopian
be4d7d2446 am cc7f40a8: Merge change 26060 into eclair
Merge commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6' into eclair-plus-aosp

* commit 'cc7f40a88d64cbb4e664e231668ae4e2862036c6':
  log an error when loading an existing GL driver fails
2009-09-20 16:15:29 -07:00
Android (Google) Code Review
cc7f40a88d Merge change 26060 into eclair
* changes:
  log an error when loading an existing GL driver fails
2009-09-20 19:09:29 -04:00
Mathias Agopian
40621774ec log an error when loading an existing GL driver fails 2009-09-20 16:07:26 -07:00
Amith Yamasani
e43530ab57 Track CPU speed stepping to get more accurate CPU cost per app.
More CPU speed stepping happening with newer devices, so we need
to qualify CPU time with the CPU speed, since power consumption
varies greatly by speed. Apps that peg the CPU should get a higher
penaltly.

Also, fix for 2062930: NPE at VolumePreference.onKey()
2009-09-20 16:03:50 -07:00
Christopher Tate
fb583427cb am 416eb3bb: am eb8aad7b: Merge change 26047 into eclair
Merge commit '416eb3bb6e3e3721cf1cb70e478f27256d881467'

* commit '416eb3bb6e3e3721cf1cb70e478f27256d881467':
  Fix up the first-backup-ever tracking
2009-09-20 15:53:55 -07:00
Christopher Tate
416eb3bb6e am eb8aad7b: Merge change 26047 into eclair
Merge commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127' into eclair-plus-aosp

* commit 'eb8aad7b2a99d3332a2fa6d8778356d634c47127':
  Fix up the first-backup-ever tracking
2009-09-20 15:42:20 -07:00
Android (Google) Code Review
eb8aad7b2a Merge change 26047 into eclair
* changes:
  Fix up the first-backup-ever tracking
2009-09-20 18:35:39 -04:00
Christopher Tate
90967f4f0d Fix up the first-backup-ever tracking
This changes a couple of bits of the Backup Manager's logic around
first-backup-ever handling.  First, it uses the same "what we've ever backed up"
handling as the rest of the system for purposes of instructing the backend to do
a wipe when the metadata is initialized for the device, instead of looking at
the presence of the @pm@ file.  Secondly, for the time being we won't be using
the saved state produced by agents' doRestore() logic.  Until the server is
migrating each restored package's data over to the new dataset, this was
resulting in the client holding an agent state blob for which no data existed on
the server under this device's identity but which the device thought was fully
up to date.
2009-09-20 15:33:35 -07:00
Karl Rosaen
ba6642703a am ef51eeed: am 6b965126: Merge change 26034 into eclair
Merge commit 'ef51eeed2a1e18280630e2ef46b3226843ec9b70'

* commit 'ef51eeed2a1e18280630e2ef46b3226843ec9b70':
  Clean up spin animation in rotary selector, and be even more generous for triggering.
2009-09-20 15:23:43 -07:00
Dianne Hackborn
836937e6a7 am f4d3e93e: am 238dc72f: Merge change 26004 into eclair
Merge commit 'f4d3e93e94382ad30047e0d3ed315aae76b2d177'

* commit 'f4d3e93e94382ad30047e0d3ed315aae76b2d177':
  Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
2009-09-20 15:23:34 -07:00
Karl Rosaen
ef51eeed2a am 6b965126: Merge change 26034 into eclair
Merge commit '6b96512601bf37d840a99c8d82dcfbcc0427b33c' into eclair-plus-aosp

* commit '6b96512601bf37d840a99c8d82dcfbcc0427b33c':
  Clean up spin animation in rotary selector, and be even more generous for triggering.
2009-09-20 15:14:07 -07:00
Dianne Hackborn
f4d3e93e94 am 238dc72f: Merge change 26004 into eclair
Merge commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c' into eclair-plus-aosp

* commit '238dc72f742efd8b9d87dc66c38c304cd6e0399c':
  Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
2009-09-20 15:13:57 -07:00
Android (Google) Code Review
6b96512601 Merge change 26034 into eclair
* changes:
  Clean up spin animation in rotary selector, and be even more generous for triggering.
2009-09-20 18:09:27 -04:00
Android (Google) Code Review
238dc72f74 Merge change 26004 into eclair
* changes:
  Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
2009-09-20 18:06:23 -04:00
Karl Rosaen
052e187eda Clean up spin animation in rotary selector, and be even more generous for triggering. 2009-09-20 15:03:20 -07:00
Suchi Amalapurapu
e5d7d7eab4 am e8e977bc: am f1871e27: Merge change 26009 into eclair
Merge commit 'e8e977bc4a5031da623188a562a1276305a7bf21'

* commit 'e8e977bc4a5031da623188a562a1276305a7bf21':
  Fix issue with printing gles version in aapt dump badging option
2009-09-20 14:45:24 -07:00
Suchi Amalapurapu
e8e977bc4a am f1871e27: Merge change 26009 into eclair
Merge commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112' into eclair-plus-aosp

* commit 'f1871e273e1bf49d72a7f2ef51a4ef377d8f3112':
  Fix issue with printing gles version in aapt dump badging option
2009-09-20 14:35:24 -07:00
Android (Google) Code Review
f1871e273e Merge change 26009 into eclair
* changes:
  Fix issue with printing gles version in aapt dump badging option If the name attribute for uses-feature or uses-permission is empty the error value is still empty indicating error and preventing the else part from being checked as it should be.
2009-09-20 17:28:28 -04:00
Chih-Chung Chang
f70b1aeaf8 am 358d4aa1: am c0df3a47: Merge change 25746 into eclair
Merge commit '358d4aa1e4b4282b7637fec24364ab286358c451'

* commit '358d4aa1e4b4282b7637fec24364ab286358c451':
  Fix 2092386: Support yuyv for camera preview format.
2009-09-20 14:11:36 -07:00
Chih-Chung Chang
358d4aa1e4 am c0df3a47: Merge change 25746 into eclair
Merge commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7' into eclair-plus-aosp

* commit 'c0df3a473f6973cf32b343a886dd62559a4b93c7':
  Fix 2092386: Support yuyv for camera preview format.
2009-09-20 13:57:36 -07:00
John Wang
437b3383d1 am bd91aa32: am b7da7dd0: Merge change 25870 into eclair
Merge commit 'bd91aa32df91801368e2843fde23a049c802513e'

* commit 'bd91aa32df91801368e2843fde23a049c802513e':
  Add ring back tone notification.
2009-09-20 13:56:54 -07:00
Oscar Montemayor
4c25aa09a6 am 584b48d2: am 00a3823d: Merge change 26008 into eclair
Merge commit '584b48d24b5200b2d307f08b2c346474f33d7190'

* commit '584b48d24b5200b2d307f08b2c346474f33d7190':
  Modified random variable to use java.security.SecureRandom for authentication challenge genration.
2009-09-20 13:56:45 -07:00
Jaikumar Ganesh
7db8a76a83 am c81ca373: am 1d390e7f: Merge change 25976 into eclair
Merge commit 'c81ca373ee4e485277e11f180d4e46f7da2d0750'

* commit 'c81ca373ee4e485277e11f180d4e46f7da2d0750':
  Fix adapter name change problem.
2009-09-20 13:56:36 -07:00
Android (Google) Code Review
c0df3a473f Merge change 25746 into eclair
* changes:
  Fix 2092386: Support yuyv for camera preview format.
2009-09-20 16:48:45 -04:00