Commit Graph

11216 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
a2ded6ca77 Use dimension value instead of fixed constant in code.
issue: 3003933
Change-Id: Iab802ccfb9a3d8c16f8884c433987c4a730f713c
2010-09-20 11:12:03 -07:00
Shimeng (Simon) Wang
14bcc0e7fe Use website preferred width as the fixed viewport.
This preferred width will be set between the default viewport width and
the max fixed viewport width.  The default viewport width serves as the
minimum fixed viewport width, so it's lowered to 980.

This change will make the shirt.woot.com/blog site works better, since it's using
1080 as the preferred width, so user needs not to scroll in overview mode.

issue: 3003933
Change-Id: Ie3eed44a54d277f5bc5f63cd394d463012a80d80
2010-09-17 10:54:48 -07:00
Shimeng (Simon) Wang
a8f99bbbbc Use website specified viewport.
In fixed viewport mode, use website specified viewport to override
the default fixed viewport.

issue: 3007588
Change-Id: I0ed86a2f829d18bf35dba47f766b23be1ace8ff5
2010-09-16 15:37:03 -07:00
Joe Onorato
04065bdcca am ee76ed9c: am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread
Merge commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb'

* commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb':
  Fix the rest of the javadoc warnings.
2010-09-16 11:32:12 -07:00
Joe Onorato
ee76ed9c0d am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread
Merge commit '4198cececf70bf034e12f19bb87f29cc29931c39' into gingerbread-plus-aosp

* commit '4198cececf70bf034e12f19bb87f29cc29931c39':
  Fix the rest of the javadoc warnings.
2010-09-16 10:41:54 -07:00
Joe Onorato
d3ad696b1d Fix the rest of the javadoc warnings.
Change-Id: Ifbf422a2eb177858813d118f03ceddcd807e73b4
2010-09-16 13:38:25 -04:00
Joe Onorato
1e7259d88e Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." 2010-09-16 10:29:33 -07:00
Vasu Nori
6728ebfa92 STOPSHIP some debugging code to help find reproducible testcases
sometimes mReferenceCount in SQLiteCloasable.java has some huge number
(a memory address probably)
this causes a database.close() or sqliteStatement.close() to randomly
fail and not release the object. and that usually causes a finalizer
warning or sqlite to return error "dbclose failed due to
unfinalised statements"

Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
2010-09-16 09:57:42 -07:00
Joe Onorato
0b6232da89 These are not javadoc tags, they are annotations in sample code. Escape them properly. 2010-09-16 12:57:18 -04:00
Joe Onorato
d35186ce18 am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread
Merge commit '7747795af508354b3792e497e6a7b4bc749b4007' into gingerbread-plus-aosp

* commit '7747795af508354b3792e497e6a7b4bc749b4007':
  These are not javadoc tags, they are annotations in sample code. Escape them properly.
2010-09-16 09:27:42 -07:00
Joe Onorato
7747795af5 Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread 2010-09-16 09:02:35 -07:00
Joe Onorato
0d903bcd78 These are not javadoc tags, they are annotations in sample code. Escape them properly.
Change-Id: Ic3b9f2738a1f8ae8aa6a2a278f1d4ba3a7727b51
2010-09-16 11:55:35 -04:00
Amith Yamasani
e678f46ec4 Query refinement feature in SearchView.
New method : setQueryRefinementEnabled() which will either enable all suggestions
to have the little query refinement icon in the right or just the ones that have
a bit set in the new SUGGEST_FLAGS column of the suggestion provider cursor.
2010-09-16 06:37:26 -07:00
Jeff Hamilton
5360eab8bb Fix deleting browser history.
Bug: 2953761
Change-Id: I19eba1f24c45ba092a583282b21d35391cfd1eb9
2010-09-16 00:46:48 -05:00
David Brown
fcec46b3d4 resolved conflicts for merge of 9c43fffc to master
Change-Id: I6b5931bae7a9507b006c723db6c0b9589038e05c
2010-09-15 21:30:12 -07:00
Jeff Hamilton
260b1fe4e0 Merge "Add new items to the BrowserContract." 2010-09-15 20:45:53 -07:00
Jeff Hamilton
4d67ac248f Add new items to the BrowserContract.
- Add a limit parameter for querying any table
- Add parameters for specifying an account when
  querying Bookmarks
- Add columns to read the source ID for a row's
  parent and insert_after references
- Add the Images, Combined, and Accounts tables

Change-Id: Ie382bc425565688b0006fa6d50765fdac226dd02
2010-09-15 22:20:07 -05:00
Robert Greenwalt
5b7c5e0552 am f434dd16: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit 'f434dd1660f222a1ee85e77c98893b90857805c2'

* commit 'f434dd1660f222a1ee85e77c98893b90857805c2':
  Update Inet Connection Status display
2010-09-15 19:49:53 -07:00
Michael Jurka
c77ffe608d Merge "fixing bug where changing alpha on one textview changed alpha on all other textviews with the same drawable" 2010-09-15 19:44:29 -07:00
Erik
ffc9bf68d6 am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'

* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
  b/3004029 Fixed content resolver loss
2010-09-15 19:10:10 -07:00
Erik
d0f81ea95c am 42e72e57: am 344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6'

* commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6':
  Close tz query cursor when done.
2010-09-15 19:10:04 -07:00
Wu-cheng Li
16d508acb3 am 4db458b4: am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'

* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
  Update camera API and javadoc for API review comments.
2010-09-15 19:03:01 -07:00
Michael Jurka
406f0522e5 fixing bug where changing alpha on one textview
changed alpha on all other textviews with the 
same drawable

Change-Id: I19c808c59654da9ed907d1356bbefe3d9926add0
2010-09-15 18:51:22 -07:00
David Brown
9c43fffc3d am 747c6153: ContactsContract: update SipAddress to be multi-valued
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp

* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
  ContactsContract: update SipAddress to be multi-valued
2010-09-15 18:38:25 -07:00
David Brown
747c615352 ContactsContract: update SipAddress to be multi-valued
This is step (1) of the device-side changes to deal with SIP addresses
becoming first-class objects in focus.

It'll be multi-valued in focus, so make it multi-valued on the device
(just like Phone, Email, Im, etc.)

Possible types are CUSTOM, HOME, WORK, and OTHER.

Also while I was in there, fixed the typo in "TYPE_MAINDEN_NAME" in the
Nickname class.  (I can't remove it, since it's public API, so I added a
new constant with the correct spelling and deprecated the misspelled
one.)

Bug: 3004838

TESTED: on passion:

  - Flashed this change onto a device that already had a contact with a
    SipAddress, verified that it still shows up fine in the UI.

  - Wiped data, rerean SetupWizard and logged in, made sure that SIP
    addresses got synced down properly.

  - Edited SIP address on the device, made sure it got correctly synced
    up to the SIP user-defined field.

Change-Id: I6ecf551b64f87de03a7807e6212297d91f9e3981
2010-09-15 18:05:29 -07:00
Robert Greenwalt
f434dd1660 am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp

* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
  Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
134b28a7f0 Merge "Update Inet Connection Status display" into gingerbread 2010-09-15 17:59:54 -07:00
Robert Greenwalt
1e9aac2bd8 Update Inet Connection Status display
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.

Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024

Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
2010-09-15 17:54:17 -07:00
Erik
bfbab8ca36 am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp

* commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
  b/3004029 Fixed content resolver loss
2010-09-15 15:54:27 -07:00
Erik
42e72e570b am 344d9663: Merge "Close tz query cursor when done." into gingerbread
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp

* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
  Close tz query cursor when done.
2010-09-15 15:54:22 -07:00
Erik
a8cc20e5fb Merge "b/3004029 Fixed content resolver loss" into gingerbread 2010-09-15 15:51:53 -07:00
Erik
344d96635e Merge "Close tz query cursor when done." into gingerbread 2010-09-15 15:51:37 -07:00
Erik
09bd4bf85e b/3004029 Fixed content resolver loss
We were creating a static AsyncQueryHandler which only held a
weak reference to the content resolver. This caused db updates
to be dropped once the original context had been gc'd. This
fix creates a new handler for each update to ensure we have a
valid resolver.

Change-Id: I049d8390ac0215e12e63d57b0bae4d3f6df64b6a
2010-09-15 15:45:19 -07:00
Vasu Nori
5e89ae29f0 fix compiled statement bugs, synchronization bugs
1. when LRU cache wants to remove the eldest entry, it may be finalizing
a statement that is still in use
2. a couple of synchronization issues.
3. a bit code refactoring in SQLiteCompiledSql
4. remove a bunch of unsed debug code from SQLiteDatabase

Change-Id: I45454dc2dbadd7d8842ba77dd2b0e9ff138ec6f4
2010-09-15 15:30:24 -07:00
Wu-cheng Li
4db458b4f7 am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp

* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
  Update camera API and javadoc for API review comments.
2010-09-15 15:01:09 -07:00
Wu-cheng Li
7836660f5e Update camera API and javadoc for API review comments.
bug:3001395
bug:3001399
Change-Id: I7030c4eff94ab11f44b862e8c206fb69a4e5c428
2010-09-15 14:47:37 -07:00
Adam Powell
0b2d306e70 Style new popup widgets.
Change-Id: I208ed292afd9919071778baa9ea61d7ca9e7743c
2010-09-15 14:39:48 -07:00
Paul Westbrook
a29d8394f1 Merge "Enable downloads of https urls" 2010-09-15 14:23:28 -07:00
Paul Westbrook
86a6019f02 Enable downloads of https urls
Bug: 3001890
Change-Id: Ibb2bc5c8efe90744a3b6f76bd31c3199a7365827
2010-09-15 13:37:46 -07:00
Erik
5ba5de93c7 Close tz query cursor when done.
Change-Id: I9cb30539b12121f01e093985985e3c802f7a9e8c
2010-09-15 13:37:19 -07:00
Makoto Onuki
90bf7c7916 Add AbstractCursor.getNotificationUri.
We'll need it for some tests.

Change-Id: I5db9f570d8ff2f58c73654fbe4a6df881894f865
2010-09-15 13:21:51 -07:00
Erik
ac212158f0 am 0b46070d: am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f'

* commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f':
  Fixes some bugs in TimeZoneUtils
2010-09-15 12:32:46 -07:00
Erik
088fbbc7b6 am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'

* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
  Adds time zone functionality into fw as a hidden api
2010-09-15 11:38:26 -07:00
Dianne Hackborn
a6555fd4b1 am 264e7277: am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f'

* commit '264e727775728d0478fcb95855e8ea3801f34c8f':
  Fix issue #2999795: Runtime restart on Crespo
2010-09-15 11:38:02 -07:00
Brad Fitzpatrick
b835d9abd6 am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'

* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
  Unify some duplicate StrictMode-enabling code.
2010-09-15 11:37:54 -07:00
Romain Guy
9ec0c471c1 am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'

* commit '282315e154b63a2eec84609600c81ad9e1c72994':
  Change the keep alive time for excess idle threads.
2010-09-15 11:37:37 -07:00
Brian Carlstrom
b3f23da320 am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'

* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-15 11:37:22 -07:00
Brian Carlstrom
7352c8bb42 am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773'

* commit '0535d8577fb2a3687428f462c591ae3220e1f773':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-15 11:36:58 -07:00
Dianne Hackborn
d0fa371f27 Add a new "activated" state to View.
Use this in ListView and GridView if the top view is not checkable.

This allows PreferenceActivity to now highlight the current heading
that is being shown.

Change-Id: I0d28aded9a61a42962b4aece420ae4058712d963
2010-09-15 11:00:44 -07:00
Daisuke Miyakawa
53b34a096b Merge "Take apart LocalePicker#onListItemClick() into two" 2010-09-15 10:54:42 -07:00