13662 Commits

Author SHA1 Message Date
Winson Chung
9b3a2cf2a0 Prevent multiple RemoteViewAdapters from being set for the same intent.
Fixing issue where we were comparing and storing intents incorrectly in the RemoteViewsService reference counting scheme.

Change-Id: Iedf5997ed3a3ee7f8729cf8689121913196571f8
2010-09-16 16:59:56 -07:00
Romain Guy
885b1f21d9 Merge "Better error handling in the OpenGL renderer." 2010-09-16 14:18:22 -07:00
Romain Guy
b025b9c8b4 Better error handling in the OpenGL renderer.
Add a glGetError() check on every frame
Don't attempt to create textures larger than the maximum size allowed

Change-Id: Iee4afae16089406dbe8bf10fc93b674f1271a0ca
2010-09-16 14:16:48 -07:00
Vasu Nori
6ca404d521 Merge "change error message on cl I392875b62ed270741633f5bffa519932e4a9f985" 2010-09-16 14:01:12 -07:00
Vasu Nori
23221192a0 change error message on cl I392875b62ed270741633f5bffa519932e4a9f985
Change-Id: I9eaf201822a9efd8afbdf5cd0e7ef2f01749b955
2010-09-16 13:59:31 -07:00
Steve Howard
0b57650666 am 4cd34abe: am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b'

* commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b':
  Support new URI structure for download provider.
2010-09-16 13:56:06 -07:00
Joe Onorato
8fca21d0fa Merge "Fix broken javadoc." 2010-09-16 13:55:45 -07:00
Steve Howard
4cd34abe53 am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp

* commit '478747181e0414d703076d4786b201718cd93d5b':
  Support new URI structure for download provider.
2010-09-16 13:45:51 -07:00
Steve Howard
478747181e Merge "Support new URI structure for download provider." into gingerbread 2010-09-16 13:42:34 -07:00
Jeff Brown
707929d6f8 am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread
Merge commit '61cf67a220ba3205737c646c1c836a92074220de'

* commit '61cf67a220ba3205737c646c1c836a92074220de':
  Input API review.
2010-09-16 13:05:50 -07:00
Jeff Brown
61cf67a220 am 24326f72: Merge "Input API review." into gingerbread
Merge commit '24326f7223275ba9c85014b86d42040e3a7d2815' into gingerbread-plus-aosp

* commit '24326f7223275ba9c85014b86d42040e3a7d2815':
  Input API review.
2010-09-16 13:01:54 -07:00
Joe Onorato
9316232130 Fix broken javadoc.
Change-Id: I4729ebee36117f281af613e0b49f70d7dee5f334
2010-09-16 16:01:53 -04:00
Jeff Brown
24326f7223 Merge "Input API review." into gingerbread 2010-09-16 12:57:56 -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
Iain Merrick
e99687c166 Update user agent string to match WebKit r67178.
Change-Id: I6ac4cf6cc0cee4f3baaa2f10b71d5706bfa781fa
2010-09-16 12:16:06 +01: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
Chet Haase
7ddff990ac am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp

* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
  Adding new assets for designers
2010-09-15 21:16:35 -07:00
Chet Haase
07980dc8a7 Merge "Adding new assets for designers" into gingerbread 2010-09-15 21:14:09 -07:00
Jeff Hamilton
260b1fe4e0 Merge "Add new items to the BrowserContract." 2010-09-15 20:45:53 -07:00
Chet Haase
a705d9259e Adding new assets for designers
Change-Id: I2ea13f0b376c6271f88baaaa2b150101fb79cff0
2010-09-15 20:44:52 -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
Chris Palmer
4e0bfd70d0 am 1b60963c: am b8dbdc29: Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit '1b60963c42e159aacc52d688defcac206e5ecec0'

* commit '1b60963c42e159aacc52d688defcac206e5ecec0':
  Clarify the danger of READ_LOGS and DUMP permissions.
2010-09-15 19:49:35 -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
Wu-cheng Li
606c3de595 am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'

* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
  Fix the runtime restart due to name change.
2010-09-15 19:11:05 -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
David Brown
b6f8989385 am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582'

* commit '0237cf2eace5d35410e95f586fd40c3068c94582':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
2010-09-15 17:43:34 -07:00
Chris Palmer
1b60963c42 am b8dbdc29: Clarify the danger of READ_LOGS and DUMP permissions.
Merge commit 'b8dbdc293a8495a873a9c36353d6a9408c698256' into gingerbread-plus-aosp

* commit 'b8dbdc293a8495a873a9c36353d6a9408c698256':
  Clarify the danger of READ_LOGS and DUMP permissions.
2010-09-15 17:33:22 -07:00
Wu-cheng Li
d63d74749f am 3fd5fa4c: Fix the runtime restart due to name change.
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp

* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
  Fix the runtime restart due to name change.
2010-09-15 17:24:40 -07:00
Chris Palmer
b8dbdc293a Clarify the danger of READ_LOGS and DUMP permissions.
The logs inevitably contain PII, so now we are making that clear in user
strings and developer docs. Moving DUMP and READ_LOGS into the PERSONAL_INFO
group.

Note that this means we need string translations.

Change-Id: I1b5bf9d2d827ab1a31dedbdb30d0906a87c26a32
2010-09-15 17:10:12 -07:00
Wu-cheng Li
3fd5fa4ca9 Fix the runtime restart due to name change.
bug:3001395
bug:3001399
Change-Id: I73fd1a63fea0807531b01ae2a754b32efffd41b1
2010-09-15 16:08:57 -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