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

39309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cary Clark
297c1acc79 am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb 
* commit '8733bea4c1631cf1d6758c45d5f2a279f7d66eed':
  scroll selected text in scrollable layers
 2011-01-10 07:29:03 -08:00
Cary Clark
8733bea4c1 Merge "scroll selected text in scrollable layers" into honeycomb 2011-01-10 07:25:33 -08:00
Cary Clark
b9aaa776a6 scroll selected text in scrollable layers 
Compute whether the initial tap point is in
a scrollable layer or not. If it is, get
the bounds of the scrollable layer and use them,
clipped to the view, to determine when the
select anchor is dragged close to the layer's
edge, to invoke autoscrolling.

Fix some bugs around stopping the autoscrolling
when there is nothing to do, and when a motion
up event is sent.

requires companion change in external/webkit

bug:3191699
Change-Id: Ic9229b063a8102ec93d0cd5bcaba774cc170c106
 2011-01-10 09:10:25 -05:00
Mike Lockwood
10bc1114f3 Add separate permission and group for access to the MTP USB driver 
Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.

Change-Id: Id03f7c4f3d2712c489b4b74cf17a72a182084501
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-10 08:54:34 -05:00
Adam Powell
3cff902b34 am 38f0c2ee: am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb 
* commit '38f0c2ee8a67865cb7fc493c76a1881d54a2c79a':
  Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
 2011-01-09 21:41:19 -08:00
Adam Powell
38f0c2ee8a am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb 
* commit '8b50495d02a6423bfa5c8cf6406e3e06b7c84f7f':
  Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
 2011-01-09 21:39:49 -08:00
Adam Powell
8b50495d02 Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb 2011-01-09 21:38:05 -08:00
Adam Powell
32c3a6929a Fix bug 3324981 - Inconsistent/buggy FastScroll behavior 
The fast scroller now always positions by index position.

Fixed a bug with always-show fast scrollers.

Change-Id: I08586ab2aae9733e78aa823aff711bcc14d2d44d
 2011-01-09 21:34:21 -08:00
Louis Huemiller
72417c2574 am 391da8cc: am 6b22a994: Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb 
* commit '391da8ccaaac77d003bbd12b7fb64d244d9e70af':
  Hardware Composer Test Lib HBlen off by 1
 2011-01-09 20:21:20 -08:00
Louis Huemiller
391da8ccaa am 6b22a994: Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb 
* commit '6b22a99481d8fadbd7f8c56b2c3b7dbc28ddd0de':
  Hardware Composer Test Lib HBlen off by 1
 2011-01-09 20:19:49 -08:00
Louis Huemiller
6b22a99481 Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb 2011-01-09 20:17:30 -08:00
Jeff Hamilton
0091091a3c am e3db3d62: Merge commit \'525f953b\' into manualmerge 
* commit 'e3db3d6209c234e032775079a1e1489478dabf86':
  Make the new NFC APIs public.
 2011-01-09 19:04:15 -08:00
Louis Huemiller
081ce9fec3 Hardware Composer Test Lib HBlen off by 1 
Change-Id: If51727a041e20afa307e5d1735b77da5a54a712b
 2011-01-09 19:02:05 -08:00
Jeff Hamilton
e3db3d6209 Merge commit '525f953b' into manualmerge 
Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
 2011-01-09 21:01:56 -06:00
Xavier Ducrohet
c77515e590 LayoutLib: display warning when a resource reference fails to resolve. 
Also fixed some warnings where a field hid one from a parent class.

Change-Id: I04ed19ebc49ae0bb0abdb0b25bc1c182fa0db440
 2011-01-09 18:11:54 -08:00
Jason Sams
73d7779e2e am f7c60a05: am e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb 
* commit 'f7c60a05bf610ad9cb6914a296dfebb72f1ad2c5':
  Fix cleanup race condition where objects might may not be cleaned up correctly.
 2011-01-09 16:50:15 -08:00
Jason Sams
f7c60a05bf am e06c3a59: Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb 
* commit 'e06c3a599f5d274ef7b1afa694ac2b1961f75aeb':
  Fix cleanup race condition where objects might may not be cleaned up correctly.
 2011-01-09 16:48:25 -08:00
Romain Guy
82020a4cbc am b6c4f790: am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb 
* commit 'b6c4f7904aa320d2129ef5b235e25d8827e45fb6':
  Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883
 2011-01-09 16:47:09 -08:00
Jason Sams
e06c3a599f Merge "Fix cleanup race condition where objects might may not be cleaned up correctly." into honeycomb 2011-01-09 16:46:25 -08:00
Romain Guy
b6c4f7904a am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb 
* commit '867b1f60e6c2fff4650e5edc4409b26c9c605f00':
  Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883
 2011-01-09 16:44:14 -08:00
Mike Lockwood
bfcbec16ea am 497e4314: am 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb 
* commit '497e4314b07a04ec6619c28b8e2a1a589186a31b':
  Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts
 2011-01-09 16:43:18 -08:00
Romain Guy
867b1f60e6 Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb 2011-01-09 16:42:35 -08:00
Romain Guy
72f0a276ff Better documentation for FLAG_HARDWARE_ACCELERATED 
Bug #3154883

Change-Id: I2062781ba3b447b8ec4e0836b9ddeaa97c7aa60e
 2011-01-09 16:45:28 -08:00
Mike Lockwood
497e4314b0 am 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb 
* commit '4c93fbce79de64780696c737424e8c41cbbd06ae':
  Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts
 2011-01-09 16:41:07 -08:00
Mike Lockwood
4c93fbce79 Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb 2011-01-09 16:39:37 -08:00
Brett Chabot
8cff70eddc am d320877f: am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API. 
* commit 'd320877f32ddfc70b10457e0ea1494f6ef1f544b':
  Add ActivityManager#isRunningInTestHarness() public API.
 2011-01-09 16:38:08 -08:00
Mike Lockwood
3f182381e1 Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts 
These broadcasts no longer exist, so remove their <protected-broadcast> elements from the manifest.
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I4a724509d3058f16283870f02e5e1b51dfb21a43
 2011-01-09 19:37:29 -05:00
Brett Chabot
d320877f32 am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API. 
* commit '3b4fcbc9f13bab6a2e9e5c37cc5e18fec7341c04':
  Add ActivityManager#isRunningInTestHarness() public API.
 2011-01-09 16:35:59 -08:00
Adam Powell
a5e768b4cc am 92752f74: am ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb 
* commit '92752f74987d96fc949268c98614ff551374e3eb':
  Honeycomb styling for the volume panel
 2011-01-09 16:32:25 -08:00
Brett Chabot
3b4fcbc9f1 Add ActivityManager#isRunningInTestHarness() public API. 
Replaces use of ro.monkey system property. This new API is controlled by
ro.test_harness.

Bug 3329873

Change-Id: Idb5bbbd9ca691976ef842eec681be34c29915976
 2011-01-09 16:31:11 -08:00
Adam Powell
92752f7498 am ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb 
* commit 'ac0f347ed83d53bbfcef7e92acd8b481be044852':
  Honeycomb styling for the volume panel
 2011-01-09 16:30:14 -08:00
Adam Powell
ac0f347ed8 Merge "Honeycomb styling for the volume panel" into honeycomb 2011-01-09 16:28:26 -08:00
Eric Laurent
4ce3600cee am 108221ee: am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb 
* commit '108221ee8c34db657f7a82ba01dd04fe3d76b19c':
  Fix issue 3317627.
 2011-01-09 16:28:14 -08:00
Eric Laurent
108221ee8c am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb 
* commit '2f67e0e746e976960b5e11045c7b455307055558':
  Fix issue 3317627.
 2011-01-09 16:26:06 -08:00
Adam Powell
3ae2706751 Honeycomb styling for the volume panel 
Change-Id: If0c870a07b8116c1b22a199de2021da46d69316b
 2011-01-09 16:26:00 -08:00
Eric Laurent
2f67e0e746 Merge "Fix issue 3317627." into honeycomb 2011-01-09 16:24:51 -08:00
Jim Miller
7f0c2bfb01 am b3a82ebd: am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb 
* commit 'b3a82ebd6e7e9c68a907ff49e396de9f6a8ccaee':
  Fix 3299611: Use system font for AM/PM indicator
 2011-01-09 16:12:58 -08:00
Jim Miller
b3a82ebd6e am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb 
* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
  Fix 3299611: Use system font for AM/PM indicator
 2011-01-09 16:10:19 -08:00
Jason Sams
84035ff6f5 Fix cleanup race condition where objects might may not 
be cleaned up correctly.

Change-Id: Ia48e06c3d050b6b39b39f8fdc9f0eb89b92fe1bf
 2011-01-09 16:09:51 -08:00
Jim Miller
730f0b238a Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb 2011-01-09 16:08:58 -08:00
Eric Laurent
58bf1d9165 Fix issue 3317627. 
The fix consists in selecting the digital audio device (SPDIF/HDMI)
when available if the routing strategy is STRATEGY_PHONE.

Change-Id: Ie500ae92f5c01f2511988543852ba559c6e5994b
 2011-01-09 16:05:30 -08:00
Jim Miller
81f9b286d1 Fix 3299611: Use system font for AM/PM indicator 
This fixes a bug where translations wouldn't pick up the proper
AM/PM indicator because AndroidClock.ttf doesn't contain the
full Android character set for translations.

Change-Id: I61737bae7383946906a4e6b776afa7463da9355d
 2011-01-09 16:03:27 -08:00
Louis Huemiller
3303046c36 am 0010e803: am edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into honeycomb 
* commit '0010e80304f770c4d343515eb7520cb89fcc2676':
  Hardware Composer Commit Points Benchmark
 2011-01-09 15:46:59 -08:00
Louis Huemiller
0010e80304 am edca0e4d: Merge "Hardware Composer Commit Points Benchmark" into honeycomb 
* commit 'edca0e4d134610fe81f731d22f6bf1cfae767ee4':
  Hardware Composer Commit Points Benchmark
 2011-01-09 15:45:25 -08:00
Louis Huemiller
edca0e4d13 Merge "Hardware Composer Commit Points Benchmark" into honeycomb 2011-01-09 15:43:55 -08:00
Romain Guy
d0b8365fcb Return the View that matches the clicked position. 
Bug #3323669

Change-Id: If6093885283f962d20bf287ba8b82d7c76f9076c
 2011-01-09 15:41:04 -08:00
Romain Guy
beaadd38b2 am e03e47b2: am d0b8365f: Return the View that matches the clicked position. Bug #3323669 
* commit 'e03e47b2f37b7c33cd142b9499fad5ea6d5921f8':
  Return the View that matches the clicked position. Bug #3323669
 2011-01-09 15:40:52 -08:00
Romain Guy
e03e47b2f3 am d0b8365f: Return the View that matches the clicked position. Bug #3323669 
* commit 'd0b8365fcbe891b0bb3b54d345337f60c292d09e':
  Return the View that matches the clicked position. Bug #3323669
 2011-01-09 15:39:14 -08:00
Adam Powell
05b481414b am 58a64c52: am c211ce24: Merge "Updated dialog and toast assets." into honeycomb 
* commit '58a64c5247365c0de610f0bb820f302c32e804cd':
  Updated dialog and toast assets.
 2011-01-09 15:27:50 -08:00
Adam Powell
58a64c5247 am c211ce24: Merge "Updated dialog and toast assets." into honeycomb 
* commit 'c211ce2439b26cfce10b694913ef56272c7f59e9':
  Updated dialog and toast assets.
 2011-01-09 15:26:08 -08:00