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

52554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
494a1281a1 Merge "Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing" 2011-06-09 16:27:39 -07:00
Dianne Hackborn
9980043e93 am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '820caf7b04f1e5c83599437e9e783e91322eb4f9':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:18:07 -07:00
Dianne Hackborn
f795e9a86d Okay *now* really enforce the limit on non-public styles. 
Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
 2011-06-09 16:17:53 -07:00
Dianne Hackborn
820caf7b04 am 8821ba86: Ummm... f*, stop breaking the build. 
* commit '8821ba860693f5206c56ae727a4231e4d6f0a735':
  Ummm...  f*, stop breaking the build.
 2011-06-09 16:14:12 -07:00
Dianne Hackborn
8821ba8606 Ummm... f*, stop breaking the build. 
Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40
 2011-06-09 16:09:15 -07:00
Andy McFadden
e1a255a89f Merge "Use public constants" 2011-06-09 16:08:16 -07:00
Fabrice Di Meglio
5f3b2f1e59 Merge "Add Configuration.getLayoutDirectionFromLocale()" 2011-06-09 16:08:00 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Shimeng (Simon) Wang
82a077043f Consider default zoom scale for mobile viewport. 
issue: 4482888
Change-Id: I6a100700b7a7e9464b397f219217225f3ada0f63
 2011-06-09 16:02:34 -07:00
Dianne Hackborn
a8d7ea067c am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:02:02 -07:00
Fabrice Di Meglio
7194efd394 Add Configuration.getLayoutDirectionFromLocale() 
- returns LAYOUT_DIRECTION_UNDEFINED / LAYOUT_DIRECTION_LTR / LAYOUT_DIRECTION_RTL depending on the Locale
- add unit tests

Change-Id: I4372734eb011cbf6270f39ba815e696b04f2352f
 2011-06-09 16:00:28 -07:00
Shimeng (Simon) Wang
b924ab5bda Merge "Fix height measure state." 2011-06-09 15:56:19 -07:00
Dianne Hackborn
220cd77de6 Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 2011-06-09 15:55:54 -07:00
Robert Greenwalt
5a8455c3c6 am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE 
* commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22':
  Set locale based on SIM preferred language.
 2011-06-09 15:54:45 -07:00
Robert Greenwalt
75749ab1a0 Merge "Set locale based on SIM preferred language." into honeycomb-LTE 2011-06-09 15:48:16 -07:00
Irfan Sheriff
70a1c1190d Merge "WifiWatchdogService refactor" 2011-06-09 15:47:08 -07:00
Svetoslav Ganov
1a92e1e5d6 Merge "Invalid access to AccessibilityInteractionController" 2011-06-09 15:45:42 -07:00
Svetoslav Ganov
601ad8061c Invalid access to AccessibilityInteractionController 
1. The Interaction connection checks if the ViewAncestor
   is valid and posts a message to be processed on the UI
   thread. The code in the UI thread did not check if
   the mView was valid. Added this check.

2. Added a faster sync mechanism in the test for
   getting the source of the last access event.

Change-Id: I9982b6592f5f44a68a67df40f37c063a3ba62993
 2011-06-09 15:44:24 -07:00
Andy McFadden
6f5b455045 Use public constants 
Some of the internal doc references were using non-public ways to
get at constants.

Bug 4575374

Change-Id: I4884d8db964950d92b3f26634724b201674bea8c
 2011-06-09 15:43:59 -07:00
James Dong
a81fcadb96 Fix an issue in MPEG4Writer where the write of outstanding chunks in the last batch was missing 
Change-Id: I93c9f6ae7ed098cdf828b2b11a9273c9e0c244e3
 2011-06-09 15:31:39 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
James Dong
a65610a04c Merge "Add timestamp and data pointer checks in CameraSource" 2011-06-09 15:27:38 -07:00
Shimeng (Simon) Wang
e7c2ee75e9 Fix height measure state. 
issue: 4257815
Change-Id: I6fc164767f805cfd13cf31707f3d53aa2714f9fc
 2011-06-09 15:11:25 -07:00
Stephen Hines
d54f3f41c4 Merge "Override equals()/hashCode() for RS BaseObj." 2011-06-09 15:06:36 -07:00
Adam Powell
fe93010446 Merge "Fix bug 4501881 - use correct TextAppearances for global actions" 2011-06-09 14:34:45 -07:00
Adam Powell
cbe7c3c20f Fix bug 4501881 - use correct TextAppearances for global actions 
Change-Id: Ie3751b92d145dd26d5211383982186af11c67b94
 2011-06-09 14:33:33 -07:00
Shimeng (Simon) Wang
d169d3cb65 Merge "Better handle double tap for smooth reflow and zoom." 2011-06-09 14:10:54 -07:00
Andy McFadden
5732bf6cab Merge "Move CalendarUtils into Calendar app" 2011-06-09 14:07:04 -07:00
Daisuke Miyakawa
63b709d9c6 Add return value spec and fix typo. 
Bug: 4371572
Change-Id: I4906a8f337dee855ef753e65eb69bdb02b1a0d72
 2011-06-09 13:56:16 -07:00
John Wang
ec87aca649 am 3948a2b4: am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '3948a2b4205c36bc1b4a3911753d970248480742':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-09 13:55:20 -07:00
Isaac Levy
188cecfdb6 WifiWatchdogService refactor 
Minor refactoring of WatchdogService ahead of logic changes.
Lightly tested on a stingray.

Change-Id: I051603a598fe3162f170fb0a09e461fcb9b0038e
 2011-06-09 13:55:15 -07:00
Mathias Agopian
880b2df55c am 96fcb702: am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit '96fcb702d75dcfb36c3ebd8fe420c8b29fa67fb7':
  Fix a leak in RefBase
 2011-06-09 13:54:54 -07:00
Shimeng (Simon) Wang
136c20b88e Better handle double tap for smooth reflow and zoom. 
In case it's the first time to reflow or the page is in zoom overview
mode, let the reflow and zoom happen at the same time to avoid the
need of double tapping twice.

Also fix the viewport width to webview's original width for mobile
site.

issue: 4482888
Change-Id: Ic7c73a9eb3f75fd68322f7f4da14141126e75ad8
 2011-06-09 13:51:55 -07:00
Adam Powell
7b75ee78c8 Merge "resolved conflicts for merge of fb339016 to master" 2011-06-09 13:16:50 -07:00
Andy McFadden
271c3aee1f Move CalendarUtils into Calendar app 
Bug 4575374

Change-Id: I325810002c63a82e712d7505327e77c388564d2c
 2011-06-09 13:14:34 -07:00
James Dong
dc03da0444 am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:50:25 -07:00
Mike Lockwood
6d60190a31 am e502c536: am b3174c46: UsbService: Fix JNI reference leak 
* commit 'e502c5364f8e715eb0da54441460b8f3cb76b7ff':
  UsbService: Fix JNI reference leak
 2011-06-09 12:50:23 -07:00
Justin Ho
e9f203e443 am 9b0a8f9a: am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '9b0a8f9a92b7b4579ecf5973d3fe61da7950fa93':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 12:50:10 -07:00
Xavier Ducrohet
48305f327f am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '2e0f71181792780b55826bcc562ae79951e76f1b':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 12:49:55 -07:00
Brian Carlstrom
d496da46a8 Merge "Implement android.webkit.BrowserFrame.requestClientCert" 2011-06-09 12:36:54 -07:00
Conley Owens
e668c0b698 am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:21:05 -07:00
Adam Powell
0419ab9e4a resolved conflicts for merge of fb339016 to master 
Change-Id: I4ffa0bb8809fa5f99feced9e243df4efa6ac00ac
 2011-06-09 12:15:10 -07:00
Conley Owens
644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
 2011-06-09 12:14:11 -07:00
Kazuhiro Ondo
e9b46c3ac5 Set locale based on SIM preferred language. 
Unless user had selected a desired locale, EFli or EFpl will be
used to decide the locale to be used.

Note this locale setting is not persistent - only valid while
SIM card is present.

Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
 2011-06-09 12:05:26 -07:00
James Dong
2488a94350 am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
 2011-06-09 12:03:52 -07:00
Mike Lockwood
e502c5364f am b3174c46: UsbService: Fix JNI reference leak 
* commit 'b3174c46ade0be4628813a74b317da538e367bc8':
  UsbService: Fix JNI reference leak
 2011-06-09 12:01:31 -07:00
tedbo
050316184b Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder. 
This adds a new ParcelSurfaceTexture.java class that can be instantiated with
a SurfaceTexture and used to send the corresponding ISurfaceTexture interface
to another process via Binder. The ParcelSurfaceTexture java object can then
be used to create an ANativeWindow based on the SurfaceTextureClient interface.

Change-Id: Ie38ea948b866e52f36a6d0f6cde19b54a8546817
 2011-06-09 11:59:23 -07:00
Wink Saville
599b102997 am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 
* commit '2d8500d21a3fe6af36040a5dcd0599e00a242766':
  Report data status from ApnContext even if data is detached
 2011-06-09 11:58:28 -07:00
Wink Saville
62bd659a09 am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit 'a384ff32827cf6383ead48ec4e0da42365ed3584':
  Use CSIM to get provision information
 2011-06-09 11:58:16 -07:00
Jean-Baptiste Queru
f1ff931594 am ed17165a: am 0315a2c5: (-s ours) am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" 
* commit 'ed17165a14e20ab5110be8c86ec1b519835613d0':
  Tweak setViewport stuff for fwd-compat
 2011-06-09 11:56:34 -07:00