Commit Graph

18222 Commits

Author SHA1 Message Date
Dianne Hackborn
65efcc5521 Merge "resolved conflicts for merge of 77fc8b80 to master" 2011-06-14 15:05:46 -07:00
Adam Powell
146a0103f4 Merge "Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException" 2011-06-14 13:47:45 -07:00
Adam Powell
e0adac0e72 Fix bug 4551701 - com.android.browser: java.lang.IllegalStateException
Fix a bug with split action bars and orientation changes.

Change-Id: If067803281c6ac23b51da5bf075fdf1be28afdc2
2011-06-14 13:46:30 -07:00
Doug Zongker
ff24bf439f Merge "deprecate RADIO constant, add getRadioVersion method" 2011-06-14 13:39:36 -07:00
Dianne Hackborn
711516d140 resolved conflicts for merge of 77fc8b80 to master
Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d
2011-06-14 12:17:35 -07:00
Doug Zongker
ad2171acf4 deprecate RADIO constant, add getRadioVersion method
On many devices the radio version system property is only available
when the radio is on, which is frequently not the case when the static
initializers for the Build class are run (eg, if the system has just
booted).  This means RADIO is forever "unknown" on these devices.
Deprecate it and add a method to return the radio version instead.
Apps will still have to deal with getting a null back if the radio
version is currently unavailable.

Change-Id: I63528eae93e1b9d0f7cec5a382724d0391ba1104
2011-06-14 11:51:59 -07:00
Dianne Hackborn
77fc8b8066 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.
2011-06-14 11:40:06 -07:00
RoboErik
bec6c36b96 Rename Calendar.java to CalendarContract.java
Change-Id: Iadb22f39d1cb3d57d1636360df24ef484a9edb58
2011-06-14 11:39:35 -07:00
Dianne Hackborn
6c0533f994 am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2
* commit 'c5193c6285d7094fb86dcb5cd56f44a3788af7c2':
  Add new landscape and portrait orientation features.
2011-06-14 11:36:05 -07:00
Daisuke Miyakawa
a7932ae77e Merge "Fix commment" 2011-06-14 11:30:47 -07:00
Dianne Hackborn
e289bff0ec Add new landscape and portrait orientation features.
Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
2011-06-14 11:23:52 -07:00
Daisuke Miyakawa
52e3823bd7 Fix commment
Change-Id: I26ea16636356c1473bf8745247b43fa9dac611c3
2011-06-14 10:56:46 -07:00
RoboErik
b2e9cde84b Merge "Update Calendar main comment" 2011-06-14 10:27:12 -07:00
RoboErik
260598d0cf Update Calendar main comment
Change-Id: I5fbbf8d6830a8fdecde2f74b51420bfede87cde9
2011-06-14 10:26:41 -07:00
Mike J. Chen
8068cb8e21 Merge "Handle always present wired ethernet interfaces at boot." 2011-06-14 09:53:23 -07:00
Narayan Kamath
9a67f26184 Merge "A few TTS bug fixes" 2011-06-14 07:05:42 -07:00
Narayan Kamath
0e20fe5bab A few TTS bug fixes
(a) ensure that onInit is called exactly once per call to initTts().
(b) TtsEngines should never return an engine that is not installed.

Change-Id: Ic1ef63a9339e6d1050e3302445ca40d3ae481f61
2011-06-14 13:29:20 +01:00
Narayan Kamath
3f0363bb4b Deprecate setEngineByPackageName
This function does not let callers know when the TTS engine has
been initialized.

Change-Id: I17fcf3f95ad5bbdb9b787ba0846e6e63d424cd23
2011-06-14 12:28:45 +01:00
Jim Miller
70832a3d77 Some tuning for MultiWaveView animations and assets:
- allow individual chevrons to be specified for (top, bottom, left, right).
- move ring to pressed position (currently w/o animation)
- add top/bottom chevron handling and refactor code accordingly.
- constrain drag handle to the ring

Change-Id: I859b2d03d8f0397c68b87a8ee15df20d55c9552c
2011-06-13 23:57:31 -07:00
Jeff Brown
3e234ba1fb Merge "Allow touches to slide out of the navigation bar." 2011-06-13 20:30:09 -07:00
Mike Lockwood
fa77931784 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Mike Lockwood
1324f22d8d Settings: Remove unused USE_PTP_INTERFACE setting
Change-Id: I743b81379053caece38c19c59bc76d6cda763d45
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-13 22:21:01 -04:00
Adam Powell
2714abff5c Merge "Expose api on View to determine if the view can be scrolled." 2011-06-13 18:45:40 -07:00
Jeff Brown
b375d3c7e1 Merge "Mimic Zygote preload steps when using wrappers." 2011-06-13 18:41:20 -07:00
Mike J. Chen
c96a667162 Handle always present wired ethernet interfaces at boot.
Devices with always present wired ethernet interfaces (as opposed
to usb ethernet dongles) don't have the interface added and removed.
Instead, it is present already at boot time.  Change EthernetDataTracker
to support the already existing at boot time case.

Change-Id: I7b8e938f6b07aabd14f00ace55b35b7a05ea5a38
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-13 18:37:11 -07:00
Jeff Brown
98db5fabda Allow touches to slide out of the navigation bar.
Change-Id: I73cabba3d62f47829bf6217700ace56a27c42b1d
2011-06-13 18:05:18 -07:00
Adam Powell
6915944fc7 Expose api on View to determine if the view can be scrolled.
Change-Id: I41783237a975151392faec04c6a85803ebbccfb4
2011-06-13 17:54:55 -07:00
Steve Block
3f71cfc149 Merge "Fix thread violation in WebView.getViewHeight()" 2011-06-13 17:17:11 -07:00
Gilles Debunne
8fa10d44e1 Merge "Switch is not affected by touch when disabled" 2011-06-13 17:09:12 -07:00
Gilles Debunne
c2ab0d665c Switch is not affected by touch when disabled
Also unchanged at the end of a drag/fling if the switch has been
disabled in the mean time.

Change-Id: Ie471a7fcf57fa633ee8eeefdfaa2939883ccfef0
2011-06-13 16:16:28 -07:00
Svetoslav Ganov
c282401b57 Merge "Final polish of the interrogation feature." 2011-06-13 14:30:30 -07:00
RoboErik
2f911b7461 Merge "Remove @hide on SyncColumns, make them protected" 2011-06-13 13:59:38 -07:00
RoboErik
0025860b61 Remove @hide on SyncColumns, make them protected
Change-Id: I375f6ca9a0ebe03b256bdb089c943571d06c9e6d
2011-06-13 13:47:59 -07:00
RoboErik
0fe7b26aa2 Merge "Make interfaces protected so they get included in api" 2011-06-13 13:32:17 -07:00
RoboErik
b2c75603b3 Make interfaces protected so they get included in api
Private interfaces do not get included in the api for classes
that implement them. We need to make them at least protected
before they will show up in the apis.

Change-Id: Ie90d2b58c7f123e734f0a6af5ec6402be6984f82
2011-06-13 12:53:48 -07:00
Martijn Coenen
fde45f5864 Merge "Support for setting the NfcA transceive timeout (API)." 2011-06-13 12:19:01 -07:00
Fabrice Di Meglio
9d9f237270 Merge "Update Configuration for renaming and fixes" 2011-06-13 11:43:12 -07:00
Philip Milne
28b6711c4c Merge "Bugfix for GridLayout assuming that the x value of last column index is maximal. This is not the case when column indexes are defined incorrectly and GridLayout should still work in this case." 2011-06-13 11:13:09 -07:00
John Reck
7abf5a6215 Merge "Tweaks for webview snap" 2011-06-13 11:12:03 -07:00
Teng-Hui Zhu
3159886ede Merge "Fix a NPE if the Chrome Client is not setup" 2011-06-13 11:07:38 -07:00
Philip Milne
51f17d5461 Bugfix for GridLayout assuming that the x value of last column index is maximal. This is not the case when column indexes are defined incorrectly and GridLayout should still work in this case.
Change-Id: I5deb3fb43ed1dd16dd20868854b96ebae4d30623
2011-06-13 10:44:49 -07:00
John Reck
2664d85f58 Tweaks for webview snap
Changed weighted average
 Increase horizontal snap

Change-Id: I7ed50e13b0b0ba409a8e655d38c704f72a3f2f78
2011-06-13 10:38:55 -07:00
Teng-Hui Zhu
592b2a65b0 Fix a NPE if the Chrome Client is not setup
This can happen when applications are using WebView to show HTML5 video in
full screen mode while not setting up WebChromeClient correctly.

Change-Id: I6575e3364f04f6eaf800f854d60992fe6c3be651
2011-06-13 10:10:51 -07:00
Ben Komalo
193bc6d606 Open up setKeyManager/setTrustManager.
The improved keystore will allow clients (Email not the least of them)
to establish SSL connections using custom client certificates. In order
to do this properly, the socket factories they use to establish these
connections need to be able to customize their behavior.

Change-Id: I6e0fa04dd01bd6481dfdad5a71a63e0371d0ad8c
2011-06-13 10:04:36 -07:00
Martijn Coenen
112fdf612d Support for setting the NfcA transceive timeout (API).
Change-Id: I2c40fbc7e9101462afae18125feba30cf76ea5f2
2011-06-13 18:22:57 +02:00
Debashish Chatterjee
492208439d Merge "Made VoicemailContract classes non-instantiable." 2011-06-13 02:10:32 -07:00
Jeff Sharkey
fdfc3c7b9f Merge "External mutation of full NetworkPolicy set." 2011-06-12 23:24:50 -07:00
Jeff Sharkey
22c055e642 External mutation of full NetworkPolicy set.
Instead of embedding complex template coexistence rules into policy
service, rely on external editors to enforce, and offer atomic
get/set operations for full policy sets.

Generate default mobile policy when none exists, using default of 4GB
warning and cycle reset of current day.  Dispatch listener events
through Handler when holding internal lock, and catch CLASS_UNKNOWN
networks in 3G_LOWER template.

Change-Id: I063cf1eaf330e32b75d0697b89fc04488e6dfaea
2011-06-12 23:21:34 -07:00
Jeff Brown
cf892f926c Merge "Ensure the RemoteViewsAdapter cleans up its HandlerThread." 2011-06-12 15:25:14 -07:00
Jeff Sharkey
4a97122ebf Growable NetworkStats object instead of builder.
NetworkStats now grows in place with arraycopy() instead of callers
needing to know record count a priori.  Better growth calculation for
both NetworkStats and NetworkStatsHistory; 50% each time.  Better
estimates of buckets needed in calling services.

Change-Id: I3adbffa0b7407612cc6349d9135a8b4eb63cd440
2011-06-11 22:17:17 -07:00