drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,477 Commits 1 Branch 0 Tags
c6f4d92839
Commit Graph

23427 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
1151fe78fc Prevent set mInitialScale being overridden by mDefaultScale. 
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
 2011-07-08 14:38:38 -07:00
Ben Dodson
6d8b80dd8c Get server's listening channel 
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
 2011-07-08 14:36:42 -07:00
RoboErik
b3a86c86e7 Merge "Pseudo-final api fixes to CalendarContract" 2011-07-08 14:05:42 -07:00
RoboErik
58644028f9 Pseudo-final api fixes to CalendarContract 
This removes the public projections and makes them arguments
that are passed in instead.

Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
 2011-07-08 13:48:53 -07:00
Wink Saville
ae367419df resolved conflicts for merge of e4a56a32 to master 
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
 2011-07-08 12:49:14 -07:00
Christopher Tate
f24ee7f1f5 Merge "Can now restore a subset of apps from historical dataset" 2011-07-08 12:48:48 -07:00
John Reck
effa7523f4 Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Christopher Tate
284f1bb4da Can now restore a subset of apps from historical dataset 
Adds the ability to filter a restore of an historical dataset so that it
only restores certain apps' data regardless of what is actually present
in the dataset.  This is currently only used by the bmgr command-line tool,
for debugging / developer support.

Bug 2021590

Change-Id: I7685e5d609b0f5506f71d70c26410602bb387659
 2011-07-08 12:28:48 -07:00
Wink Saville
d5cabff96a am a736cd54: am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit 'a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 12:28:27 -07:00
Romain Guy
44476779ae Merge "Correctly position layers." 2011-07-08 11:58:18 -07:00
Romain Guy
b2479153b7 Correctly position layers. 
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
 2011-07-08 11:57:29 -07:00
Kristian Monsen
7cec24f747 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
John Reck
d4324aa101 NPE guard in setupViewport 
Bug: 4163660

Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
 2011-07-08 11:23:39 -07:00
Narayan Kamath
6dabb63307 Add event-log logging for TTS requests. 
Change-Id: I5023194c469a602b85259088a2e59373c96a941e
 2011-07-08 17:55:25 +01:00
Wink Saville
e4a56a32ac am 8171e6f6: Use resetConnections with resetMask. 
* commit '8171e6f690cca1bad354e7e352823d79d420daf3':
  Use resetConnections with resetMask.
 2011-07-08 09:40:08 -07:00
Wink Saville
a736cd54e1 am 848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE 
* commit '848aa3ab8a00835c5af2ead954c7736e507249b5':
  No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
 2011-07-08 09:40:03 -07:00
Kristian Monsen
918b183295 Merge Chromium at r12.0.742.93: New autofill string 
Added a string that we now use.

Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
 2011-07-08 16:45:10 +01:00
Adam Powell
7024e0b902 Merge "Add ALL CAPS style to TextView/TextAppearance" 2011-07-07 20:55:10 -07:00
Romain Guy
69abbd8791 Merge "Use NEAREST filtering for layers whenever possible." 2011-07-07 20:55:08 -07:00
Romain Guy
9ace8f5e79 Use NEAREST filtering for layers whenever possible. 
Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
 2011-07-07 20:50:11 -07:00
Adam Powell
7f8f79a1ff Add ALL CAPS style to TextView/TextAppearance 
Switch out ugly hack in action menu items for the new style.

Change-Id: I68a0ed62a352b14d499e6478b82bbc12dcb5a030
 2011-07-07 20:39:41 -07:00
Shimeng (Simon) Wang
ab5a5e6748 Merge "Update viewport asap." 2011-07-07 16:17:16 -07:00
Wink Saville
8171e6f690 Use resetConnections with resetMask. 
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
 2011-07-07 16:17:06 -07:00
Gilles Debunne
08009f1446 Merge "XmlDocumentProvider moved to the XmlAdapter sample code" 2011-07-07 16:07:07 -07:00
Shimeng (Simon) Wang
56bd4349fc Update viewport asap. 
Update viewport as soon as possible to make sure layout has correct viewport.

This helps fixes gmail flickering issue.

Also helps the case a mobile site is switched to desktop when the
user agent is switched.

issue: 4723800
Change-Id: I3dc9e52d912d49478d562cec3f38d653a563715e
 2011-07-07 15:26:22 -07:00
Huahui Wu
1d19c18f9b Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."" 2011-07-07 15:10:25 -07:00
Huahui Wu
98933f3f68 Revert "b/3302378 Passes touch pressures, size and timestamps to webkit." 
This reverts commit 6e64e0c61720244894dbd1fd6b36394adc63b2de.
It introduced a null pointer crash for pinch-and-zoom.

Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
 2011-07-07 14:58:37 -07:00
Adam Powell
eea5be5447 Merge "Action bar layout tweaks" 2011-07-07 14:35:22 -07:00
Philip Milne
6d836b606b Merge "Simplify and tidy the API for maximum value support." 2011-07-07 14:30:31 -07:00
Philip Milne
5d1a9840aa Simplify and tidy the API for maximum value support. 
Also:

. Remove CAN_SHRINK, FIXED from public view. These can be added later.

Change-Id: I63a64ac4748605da60373c8e3c2109178b5260c2
 2011-07-07 14:23:00 -07:00
Wink Saville
8735a07a64 No need to have BASE_DATA_CONNECTION_TRACKER start at 50000. 
Update comment that values should be changed after releasing.

Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
 2011-07-07 14:16:30 -07:00
Adam Powell
160bb7fa60 Action bar layout tweaks 
Fix a Spinner issue that reported odd baselines

Fix detection of expandable items for action menus and allocation of cells

Use the right asset for home-as-up in Theme.Holo.Light.SolidActionBar.Inverse

Add TextAppearance.Holo.Widget.ActionBar.Menu as a basis for further
menu item styling

Sync with design for tab/menu text appearance

Change-Id: I32026bbde1cd4e15b6cda30d78d3d48250c84c94
 2011-07-07 14:14:38 -07:00
Romain Guy
b1b375ee08 Merge "Add an API to query maximum bitmap/texture size on Canvas." 2011-07-07 14:10:52 -07:00
Romain Guy
f61970fc79 Add an API to query maximum bitmap/texture size on Canvas. 
Change-Id: I2c576c9a4ecad9f33cc6636bcbc29786acdf052d
 2011-07-07 14:10:06 -07:00
Daniel Lehmann
fb7a1446c0 Merge "Contacts contract changes for social updates." 2011-07-07 13:35:00 -07:00
Matthew Xie
a0c680393f Incoming Bluetooth Connection requests - dialog. 
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Includes down merged contributions from Jaikumar Ganesh.

Change-Id: Ic8b857aad3554315aae39a0e871eb94d0ac98a91
 2011-07-07 12:43:27 -07:00
Eric Fischer
b75a798471 Merge "Import revised translations." 2011-07-07 11:33:38 -07:00
Eric Fischer
ff2612bc9d Import revised translations. 
Change-Id: Iad20de7deafae6bfec4c37f23a1fcea35aae5a46
 2011-07-07 11:27:19 -07:00
Huahui Wu
b083fa61d9 Merge "b/3302378 Passes touch pressures, size and timestamps to webkit." 2011-07-07 11:05:13 -07:00
Huahui Wu
6e64e0c617 b/3302378 Passes touch pressures, size and timestamps to webkit. 
Related CL in WebKit:
  https://android-git.corp.google.com/g/#change,118422

Change-Id: Ibf209131a6d9ca8186c461b0c5b6286e5f669d0d
 2011-07-07 10:59:27 -07:00
Jeff Sharkey
2ad3111759 Merge "Temporarily disable socket tagging." 2011-07-07 10:23:44 -07:00
Jeff Sharkey
d0d2517d52 Temporarily disable socket tagging. 
Change-Id: Ib4a8babdbbe3ea05057dc930b67c2cac89ac5e42
 2011-07-07 10:22:04 -07:00
Jean-Baptiste Queru
d5299ff39a Merge 37dbfcaf 
Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0
 2011-07-07 08:46:09 -07:00
Adrian Ludwig
1a65b441b1 Merge "Android security code review." 2011-07-07 08:08:13 -07:00
Mathew Inwood
bdaa1aafd5 SearchBox API to determine if it's supported by the current page. 
Change-Id: I0119243ed0e19e237c1f51de887af5c954f96693
 2011-07-07 12:56:39 +01:00
Adam Powell
2c742c2aeb Fix bug 5000009 - NPE in Phone UI 
Change-Id: I9c5c2c73b340192d754949865b6e4ee4a9a324ff
 2011-07-06 23:18:25 -07:00
Adam Powell
a72ef62e5c Add style/theme definitions for solid action bar configurations. 
Change-Id: I540e12ad3d8fc779dac24402286d995f542b5d25
 2011-07-06 22:58:50 -07:00
Irfan Sheriff
6d815e9dd0 Merge "Moved WifiWatchdogService and DnsPinger" 2011-07-06 22:08:38 -07:00
Elliott Hughes
ed61ee1fae Merge "Add the "debug.jni.logging" property so third-party developers can debug their JNI problems." 2011-07-06 18:11:20 -07:00
Elliott Hughes
ae07ecf376 Add the "debug.jni.logging" property so third-party developers can debug their JNI problems. 
This turns on the super-verbose but indispensible logging of all native method
calls and all calls to JNI functions (for third-party code only). In particular,
if you have a local reference bug, you can search for the reference given in
the crash and see exactly where it came from. In every case I've seen so far,
that's pinpointed the bug exactly.

Change-Id: Ifb7ba02ae637bdd53cd8500febdcb9d4d7799bda
 2011-07-06 17:33:27 -07:00