14522 Commits

Author SHA1 Message Date
Gilles Debunne
f960718c1c am 1ae32bfe: New assets for buttons and notification
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
2010-10-07 07:15:05 -07:00
Wu-cheng Li
29332971dd Merge "Add javadoc for display orientation." into gingerbread 2010-10-07 05:49:27 -07:00
Wu-cheng Li
c157e0cd16 Add javadoc for display orientation.
Display orientation should be considered while setting preview size,
picture size, or thumbnail size.

bug:3051937
Change-Id: I3b6bd1b920e4752ffdfc8aec56a0da9d474dd630
2010-10-07 19:41:23 +08:00
Kristian Monsen
b5c564fed2 Merge WebKit at r68651 : Update user agent string
Change-Id: Ib48186532c9a6033f1fb107f1fc072cd4fe89820
2010-10-07 11:17:12 +01:00
satok
5847b20c0c Merge "Add InputMethodEnabler for enabling input methods and subtypes" 2010-10-06 22:46:32 -07:00
satok
47a44916e2 Add InputMethodEnabler for enabling input methods and subtypes
- Copyed functionarity from LanguageSettings.java

TODO: Save enabled InputMethodSubtypes

Change-Id: I7b4fb1a79cb8b3229f88773d261430e23ba7aae2
2010-10-07 14:43:16 +09:00
Jeff Sharkey
7172bdac31 Assign parent TextAppearances to Holo.Light theme.
Change-Id: I60e82ec78c4e766bf1fbd86a0d6cd6c972cbbf81
2010-10-06 22:37:04 -07:00
Adam Powell
fbb3b4768e Fix bug 3066313 - integrate new text anchor assets.
This adds the differentiated left/right anchors for hdpi and further
tweaks the behavior of text anchors.

Highlights:
* New assets are translucent - increased visibility for whatever is
  beneath.
* Start and end anchors may not cross one another.
* Minimum selection size is now 1.
* Touch targeting tweaked.

Change-Id: I601361323916ee19149562a23dc3242d908da45c
2010-10-06 21:46:28 -07:00
Romain Guy
e743bd2bac Merge "Don't clear the framebuffer when not needed." 2010-10-06 19:51:36 -07:00
Romain Guy
6b7bd24659 Don't clear the framebuffer when not needed. 2010-10-06 19:49:23 -07:00
Gilles Debunne
8b1764fdc8 Removed unused and broken screen_progress
Change-Id: I3b9557d1d4bdc55d6468c276efc77bde440755af
2010-10-06 19:09:52 -07:00
Dianne Hackborn
bfba7cab94 Fix issue #3001362: API REVIEW: android.view.InputQueue.Callback
Change-Id: Ibc12a7326a13c318205774e226ed1f62a5cf11eb
2010-10-06 17:58:05 -07:00
Christopher Tate
5ada6cb059 More drag/drop adjustments:
* Make View.onDragEvent() public instead of protected.
* No longer @hide View.startDrag()
* Properly manage the boundaries of DRAG_STARTED / DRAG_ENDED notifications
  to windows (and as a result don't send bogus empty DRAG_STARTED events or
  double-recycle pooled DragEvents)

Change-Id: Ib75f5c1417640c82a5b043c555e02d6e6f4b4d9c
2010-10-06 17:33:10 -07:00
Eric Fischer
70f1a3b8a0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:17 -07:00
Dianne Hackborn
9d6824cd53 Merge "Make Activity.removeDialog() less strict." into gingerbread 2010-10-06 17:26:16 -07:00
Eric Fischer
3d1841c788 Import revised translations. DO NOT MERGE
Change-Id: Id9a7d2da704ed4d37efa8646815835fc6a7c5473
2010-10-06 17:11:06 -07:00
Brett Chabot
c7912274b0 am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'

* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
  Failing test cleanup.
2010-10-06 17:10:48 -07:00
Dianne Hackborn
d2ce8bbb84 Make Activity.removeDialog() less strict.
It was extremely annoying not being able to do this.

Change-Id: I9a13b4fdd984a5e9d8f9ac49c7ede218c4481c2b
2010-10-06 17:09:47 -07:00
Adam Powell
6ed895a4fa am 41170a1a: am abcbb1a1: Fix bug 3061544 and some clipping errors.
Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9'

* commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9':
  Fix bug 3061544 and some clipping errors.
2010-10-06 17:08:52 -07:00
Dianne Hackborn
72b526a13c am cb9f1e4d: am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'

* commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
  Make it easier to figure out whether an app can go on sd card.
2010-10-06 17:08:15 -07:00
Neal Nguyen
e2562ca8f1 am daa9b8c6: am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit 'daa9b8c69a3069d5533176e6caa286380b4675c2'

* commit 'daa9b8c69a3069d5533176e6caa286380b4675c2':
  Fixing some flakiness of some DL Manager tests.
2010-10-06 17:07:58 -07:00
Mathias Agopian
7930b5bc06 am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'

* commit '722665c5f76e81bed646490977ea30f38aaa00da':
  fix build. SurfaceView.setFrame needed to be hidden
2010-10-06 17:07:30 -07:00
Kenny Root
a3ee5c0351 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -07:00
Dianne Hackborn
ef083ec008 Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 2010-10-06 16:56:02 -07:00
Mathias Agopian
3243cbc9b2 am b99e81ab: am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2'

* commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-06 16:17:44 -07:00
Nick Pelly
664d035829 am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'

* commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
  New API stubs: NdefMessage and NdefRecord.
2010-10-06 16:16:56 -07:00
Gilles Debunne
3139ab218a am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset."
Merge commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'

* commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
  Revert "Restored ic_dialog_menu_generic asset."
2010-10-06 16:07:42 -07:00
Kenny Root
17eb6fb07c Add MountService tests and fix a bug it found
Add some MountService tests that are based partially on some stuff done
in PackageManagerTests. This allows us to test the OBB changes in an
easy way.

Also, it found some bugs in the DefaultContainerService connection state
machine, so fix those while we're at it.

Change-Id: I18f38593be754eb32fb6e842f88eec47e2beefce
2010-10-06 15:39:28 -07:00
Gilles Debunne
efaa4f075d resolved conflicts for merge of 1153629c to master
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
2010-10-06 14:38:27 -07:00
Gilles Debunne
1ae32bfebf New assets for buttons and notification
Change-Id: I95ffa7600476f97e3be3c577ef55855abeaeac5e
2010-10-06 14:32:29 -07:00
Dianne Hackborn
043fcd9847 Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Exposes an Intent I need (okay it fixes an unrelated thing in the power widget),
and fixes some dump output.

Change-Id: I51d6c93a6ac879bab64e9d5aa21129e2bbcd461b
2010-10-06 14:27:34 -07:00
Neel Parekh
03bc711c8a Merge "Fix pressed vs selected typo in onCreateDrawableState" 2010-10-06 11:45:55 -07:00
Neel Parekh
e537858ba7 Fix pressed vs selected typo in onCreateDrawableState
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
2010-10-06 11:39:53 -07:00
Irfan Sheriff
be93061e2c Merge "Add LinkAddress" 2010-10-06 11:26:44 -07:00
Shimeng (Simon) Wang
e99b0b992a Merge "Add wrapper method for native JNI call." 2010-10-06 11:20:05 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Adam Cohen
32e60fbea7 Merge "Fixing AdapterViewAnimator crash when associated adapter is empty" 2010-10-06 10:43:18 -07:00
Adam Cohen
3042944c6e Fixing AdapterViewAnimator crash when associated adapter is empty
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
2010-10-06 10:39:11 -07:00
Jaikumar Ganesh
59453c947a DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
PBAP profile is associated with HFP profile. Disconnect PBAP
profile while disconnecting HFP profile. We ever never doing this
and were expecting the remote end to do it. So when the user
disconnects a headset, we will end up with the ACL link still up
because PBAP has not been disconnected.

This is little bit of a hack till PBAP profile is converted to
use the new profile APIs.

Change-Id: I5f68b228fd5e607605928a52343ad4b86c58ac0b
2010-10-06 19:23:38 +02:00
Fred Quintana
c8b7971cb3 Merge "Make a separate active sync queue for initialization and regular syncs." 2010-10-06 10:03:19 -07:00
Steve Block
e86b8a18df Merge "Make sure that we send the DeviceOrientation error event only once" 2010-10-06 08:30:13 -07:00
Steve Block
8980343b13 Make sure that we send the DeviceOrientation error event only once
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
2010-10-06 16:12:06 +01:00
Brian Carlstrom
c9d5b31f84 Fix instance count to be long
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
2010-10-05 22:23:41 -07:00
Brian Carlstrom
c21550a8d1 Adding android.os.Debug.countInstancesOfClass
- Debug.countInstancesOfClass is just a wrapper on
  dalvik.system.VMDebug.countInstancesOfClass to avoid code from
  depending on the dalvik classes directly

- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
  and ViewDebug are converted to the new Debug.countInstancesOfClass

- Existing use of OpenSSLSocketImpl.instanceCount, which is being
  removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)

Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
2010-10-05 21:38:57 -07:00
Robert Greenwalt
759bece170 Merge "Turn on some debugging info" 2010-10-05 19:14:45 -07:00
Robert Greenwalt
ba175a5e13 Turn on some debugging info
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
2010-10-05 19:12:26 -07:00
Dianne Hackborn
92d29c66f5 am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
Merge commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9' into gingerbread-plus-aosp

* commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9':
  Fix NPE if there is no accelerometer.
2010-10-05 19:06:04 -07:00
Dianne Hackborn
a2a0a98ac7 Merge "Fix NPE if there is no accelerometer." into gingerbread 2010-10-05 19:02:52 -07:00
Dianne Hackborn
efa4f7f87d am 4e6baf24: Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread
Merge commit '4e6baf2473e522e6d53afa01348c564148bfbad7' into gingerbread-plus-aosp

* commit '4e6baf2473e522e6d53afa01348c564148bfbad7':
  Fix issue #3001368: API REVIEW: android.app.Activity
2010-10-05 18:59:57 -07:00
Dianne Hackborn
4e6baf2473 Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 2010-10-05 18:56:54 -07:00