22841 Commits

Author SHA1 Message Date
Chia-chi Yeh
72fba1caea Merge "VPN: move VpnDialogs related methods into VpnConfig." 2011-06-17 14:37:11 -07:00
Daisuke Miyakawa
cd0385bf8c Merge "Remove HanziToPinin.java" 2011-06-17 14:36:42 -07:00
Chia-chi Yeh
7b0b834c3d VPN: move VpnDialogs related methods into VpnConfig.
This might not be the best place for the glue code, but it is
known that choosing VpnBuilder will introduce a dependency
cycle of VpnBuilder, ConnectivityService, and the Vpn class.

Change-Id: I3f03617d1fe1a0b8fb3705c23265676fff51a75c
2011-06-17 14:34:11 -07:00
Adam Powell
09b8a55516 Merge "Bug 4726236 - NPE at dispatchRestoreInstanceState" 2011-06-17 14:32:23 -07:00
Adam Powell
f1a4549604 Bug 4726236 - NPE at dispatchRestoreInstanceState
Change-Id: Ib7eba6ead85fa4daa8046bbc2d4d3fcc1d4223c3
2011-06-17 14:31:34 -07:00
Amith Yamasani
4f844e2636 Merge "Inform the InputMethodManager that a focused view has been attached." 2011-06-17 14:29:17 -07:00
Adam Powell
414c4984fd Merge "Create theme attributes for small and large listPreferredItemHeight. Change default holo dialog list items to use them." 2011-06-17 13:57:07 -07:00
Daisuke Miyakawa
18cc57fb93 Merge "Add API for auto-complete ranking improvement." 2011-06-17 13:10:40 -07:00
John Reck
79e16da930 Merge "Make textZoom public" 2011-06-17 13:05:56 -07:00
Daniel Sandler
d3cdbf0a4f Merge "ICS updates to notification layouts." 2011-06-17 12:43:21 -07:00
Amith Yamasani
4503c8dd71 Inform the InputMethodManager that a focused view has been attached.
This enables new fragments or views that have a focused EditText to register
the view with the input method framework as the served view.

Change-Id: I260439223b56626f2e57bd778bbe5194ed44e361
2011-06-17 12:36:14 -07:00
Adam Powell
c8834722d5 Create theme attributes for small and large
listPreferredItemHeight. Change default holo dialog list items to use
them.

Tweak dialog button bar style.

Change-Id: I9bf14621aea44b8b7d60c290ecea86e6284ccdaa
2011-06-17 11:56:53 -07:00
John Reck
caeb120170 Make textZoom public
Deprecate textSize (enum based) in favor of textZoom (percentage based)

Change-Id: Ibb4c25b461bcb57e5c2cdf709485d255db20a43c
2011-06-17 11:50:15 -07:00
Philip Milne
395eef3bb6 Merge "Change includeMarginsInAlignment flag to aligmentMode property." 2011-06-17 11:22:36 -07:00
RoboErik
59dab49cb8 hide CalendarMetaDataColumns
Change-Id: I248b608cfdac51b8fe2ccc36fa1701c3f1915849
2011-06-17 11:09:36 -07:00
John Reck
08664e815c Merge "Add textZoom setting" 2011-06-17 10:51:23 -07:00
Daniel Sandler
ebce0115e2 ICS updates to notification layouts.
Of note:

1. There is no "X" (veto) button anymore. (Well, there is,
   but it's offscreen so it should still be available to
   assistive devices.) Users can use "Clear all" or the new
   swipe-to-veto gesture to clear notifications.

2. As a consequence of #1, your layout goes all the way to
   the right edge of the notifications panel again. Enjoy
   the extra space!

3. The numeric bubble in the notification icon is now capped
   at "999+" like it is in the expanded notification view.
   (Note that this involves a couple of new public framework
   resources: one to indicate the number beyond which the
   substitution string will be used, and one specifying a
   localizable substitution string.)

Bug: 4651514
Bug: 4686329
Bug: 4501990
Change-Id: I0e6bdb6aec4fe5bfc927eb1aba955d444a9414ec
2011-06-17 13:28:56 -04:00
Irfan Sheriff
f2288c960c Merge "Fix IP address cleanup on network disconnect" 2011-06-17 10:09:36 -07:00
Irfan Sheriff
f5600618df Fix IP address cleanup on network disconnect
We used to bring down the interface on network disconnect
which would in turn clean up all the IP addresses.

The interface bringup/shutdown is now handled by wpa_supplicant.
Add netd interface for clearing all IP addresses

Bug: 4676254
Change-Id: I7e24c0ab2e4a412b8d61e9c33ce028966913aaf6
2011-06-17 10:03:13 -07:00
John Reck
ff56bcde85 Add textZoom setting
Replaces the limited textSize (enum) with a more flexible
 textZoom (percent)

Change-Id: I443757841910f5cbe1c9078166361d1686005f14
2011-06-17 09:39:39 -07:00
Wu-cheng Li
25b93adeae Merge "Mention device policay manager in Camera.open javadoc." 2011-06-17 00:18:21 -07:00
Wu-cheng Li
facc8ce116 Mention device policay manager in Camera.open javadoc.
bug:4185309
Change-Id: I733654a0be1953851dac7686c9c38e7af8f1d73a
2011-06-17 13:11:03 +08:00
Philip Milne
1e54825135 Change includeMarginsInAlignment flag to aligmentMode property.
Also:

. Change getInteger() to getInt().
. Conditionally compile, Paint() allocation and initialization.
. Correct spelling mistake in javadoc.

Change-Id: I00438a717e635a3917c5324f56063dce2e6041e8
2011-06-16 20:47:29 -07:00
Jim Miller
452eec33d6 Merge "Update GridLayout constructors to properly handle DEBUG=true" 2011-06-16 18:32:44 -07:00
Adam Powell
05c06de73c Merge "Dialog-o-rama!" 2011-06-16 18:31:18 -07:00
Adam Powell
a93347a62e Dialog-o-rama!
New styling for Holo dialogs. Now 76% easier for apps to create
dialog-based layouts! (Less tricky padding and margin rules)

Cancelable AlertDialogs now are canceled when the user touches
outside.

Dialogs in landscape mode will try not to fill the width of the
screen.

Change-Id: I621b5a19780883ee703a8492510451b480a0b8cc
2011-06-16 18:20:54 -07:00
Daisuke Miyakawa
1515c0b519 Remove HanziToPinin.java
Those files are moved to ContactsProvider package.

Must be after If786dd286dab47ca1b2ccab38c5fa43ae390c0f7

Bug: 4645142
Change-Id: I774426347e8331fc1c203d5d8e6887e83baffc9f
2011-06-16 17:42:18 -07:00
Jim Miller
c655ba5e46 Update GridLayout constructors to properly handle DEBUG=true
This fixes a case where the grid layout debugging wasn't showing.

Change-Id: I28b2754d2d824731e24126300bc501ae2e379ee4
2011-06-16 17:33:20 -07:00
Maarten Hooft
3a3efe7563 am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '769bf5d59ef1b6a9bce9d64d9761def735d6af65':
  Import revised Croatian translations.
2011-06-16 17:05:19 -07:00
Dianne Hackborn
46d6bcfb95 Merge "resolved conflicts for merge of 872a1e79 to master" 2011-06-16 16:38:07 -07:00
Romain Guy
bec9be2f51 Merge "Prevent TweetDeck from crashing." 2011-06-16 16:14:06 -07:00
Romain Guy
5d5d1ff2d5 Prevent TweetDeck from crashing.
Change-Id: I964d9152010060c3a2698cdb6c22ac21da1af8b0
2011-06-16 16:13:01 -07:00
Dianne Hackborn
a7f88508d3 resolved conflicts for merge of 872a1e79 to master
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
2011-06-16 16:01:27 -07:00
Maarten Hooft
769bf5d59e am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '42781a11ce9e346a24fbb6214f8f214845464213':
  Import revised Croatian translations.
2011-06-16 15:55:14 -07:00
Maarten Hooft
42781a11ce am d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
2011-06-16 15:48:55 -07:00
RoboErik
29ddc3bc27 Merge "Adds more docs to classes in CalendarContract" 2011-06-16 15:44:08 -07:00
RoboErik
3771fcbc19 Adds more docs to classes in CalendarContract
Change-Id: I73d93a6a823100394a707e6b85de40fc6e242c03
2011-06-16 15:41:31 -07:00
Dianne Hackborn
872a1e793c am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
  SDK only: integrate new sample code, deprecating along the way.
2011-06-16 15:25:22 -07:00
Dianne Hackborn
9a73c4d3a9 am 2f04883f: SDK only: integrate new sample code, deprecating along the way.
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
  SDK only: integrate new sample code, deprecating along the way.
2011-06-16 15:22:10 -07:00
Dianne Hackborn
2f04883ff8 SDK only: integrate new sample code, deprecating along the way.
The new support library features and sample code for switching
between fragments using a TabHost now eliminates the utility of
the TabActivity class, so deprecate it.  This also means there is
no longer any use in ActivityGroup or LocalActivityManager.  Yay.

Also fix up things so the new support API demos are included in
the documentation.

Change-Id: I4f073b82787f32560ba1fa5b6a23746ecc8aecdc
2011-06-16 14:52:00 -07:00
Fabrice Di Meglio
c1f9486a3e Merge "Update getLayoutDirectionFromLocale() for using ICU" 2011-06-16 14:41:50 -07:00
Fabrice Di Meglio
c01924f156 Update getLayoutDirectionFromLocale() for using ICU
- now relying on ICU.getScript() and ICU.addLikelySubtags() for getting the locale script
- clean unit tests imports

Change-Id: Icdc45fa78490d1e2dde0e83bca0feea8aa205cdf
2011-06-16 14:40:31 -07:00
Chet Haase
b47f2f9533 Merge "Fix crash in ViewPropertyAnimator for unparented view." 2011-06-16 14:06:36 -07:00
Chet Haase
3a000a52d6 Fix crash in ViewPropertyAnimator for unparented view.
Mechanism for removing possible earlier animations should
call removeCallbacks on the view, not on the (possibly null)
handler of the view.

Change-Id: I76c6f0bea5e009be9197a6e49e9360ed9ef1a9cb
2011-06-16 14:03:08 -07:00
RoboErik
da67237225 Merge "Add DroidDocs to Events class" 2011-06-16 13:51:16 -07:00
RoboErik
fe37b49dd4 Add DroidDocs to Events class
Change-Id: I85b14e8a553a1bc160d05a9f076d4aea77e9a39f
2011-06-16 13:40:02 -07:00
Jeff Sharkey
ad4c9ed7de Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -07:00
John Reck
179cfcf654 Merge "Inline SeekBarPreference" 2011-06-16 13:21:52 -07:00
Jeff Sharkey
1a30395358 DownloadManager flags for network policy.
Handful of DownloadManager flags to record when a download was paused
because of NetworkPolicyManager rules.

Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4
2011-06-16 13:04:34 -07:00
Robert Greenwalt
4f1f7d3158 am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
* commit '241b65aca93e263f0869c5bec4ad1dbda0dec6db':
  Reset connections AFTER we take down the network.
2011-06-16 12:50:46 -07:00