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

11932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
bfb8606831 am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 
Merge commit '2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp

* commit '2a79defa5a0481e4dd980938da13adc767e0b231':
  docs: add guide to copying and installing the Dev Tools app
 2010-01-20 17:15:09 -08:00
Scott Main
2a79defa5a Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 2010-01-20 17:10:25 -08:00
Scott Main
2c9d7fe21a docs: add guide to copying and installing the Dev Tools app 
from the emulator to a device.
 2010-01-20 16:58:46 -08:00
Irfan Sheriff
6b32c0a2ff am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair 
Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp

* commit '48ef378d01b3ace349cbb6ba564276b854d872c9':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state
 2010-01-20 13:30:17 -08:00
Robert Greenwalt
8c48b4a532 am 1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair 
Merge commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp

* commit '1a337547d5377c57dbb10a24d4d73ad6bda829ea':
  Add bugreport info about network feature use. DO NOT MERGE
 2010-01-20 13:30:11 -08:00
Irfan Sheriff
48ef378d01 Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair 2010-01-20 13:26:08 -08:00
Robert Greenwalt
1a337547d5 Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair 2010-01-20 13:26:04 -08:00
Mike Reed
70660425c0 am 9f954cf2: Merge "Do not merge" into eclair 
Merge commit '9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp

* commit '9f954cf27e9e2bb94c836b1686c0e07500234b27':
  Do not merge
 2010-01-20 13:21:26 -08:00
Mike Reed
9f954cf27e Merge "Do not merge" into eclair 2010-01-20 13:17:49 -08:00
Robert Greenwalt
73912ce083 Add bugreport info about network feature use. DO NOT MERGE 
Backported from master change Ib9285359.

We've had a couple bug reports showing the effects of a left-live feature request.
We need a bit more bugreport-time logging.

bug: 2323226
bug: 2377507
change-id: I296b2887101c260aea678bf6db91144535cbad7e
 2010-01-20 12:36:09 -08:00
Robert Greenwalt
d2c21c1518 am 8c166512: Merge "Cleanup of process-specific DNS." into eclair 
Merge commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp

* commit '8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
  Cleanup of process-specific DNS.
 2010-01-20 11:12:40 -08:00
Robert Greenwalt
8c166512a7 Merge "Cleanup of process-specific DNS." into eclair 2010-01-20 11:08:13 -08:00
Irfan Sheriff
0fe3f7cbbf DO NOT MERGE Avoid wifi disable in a UNKNOWN state 
Multiple broadcast receiver unregister calls cause exception.

Bug: 2361335
 2010-01-20 10:08:23 -08:00
Mike Lockwood
47d302a001 am bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair 
Merge commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp

* commit 'bb79e5fdb52eb86963fc688e6a455451b6e1a867':
  Be tolerant of GPS session and engine on status messages arriving out of order.
 2010-01-20 10:04:13 -08:00
Mike Lockwood
bb79e5fdb5 Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair 2010-01-20 10:00:55 -08:00
Xavier Ducrohet
3bd6dc6535 am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair 
Merge commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp

* commit 'b44051eee04450888a7dcb1cd2e6f31d0edfb678':
  ADT/Layoutlib: implement sweep gradient.
 2010-01-20 09:47:06 -08:00
Xavier Ducrohet
b44051eee0 Merge "ADT/Layoutlib: implement sweep gradient." into eclair 2010-01-20 09:43:46 -08:00
Mike Lockwood
cf1d8cb36f Be tolerant of GPS session and engine on status messages arriving out of order. 
BUG: 2366194

Change-Id: I642dacd397202f671adba5a863394438ca62988d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-01-20 10:20:54 -05:00
Scott Main
382f924c95 am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file 
Merge commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp

* commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
  docs: a lot of revision and expansion of the hello view tutorials
 2010-01-19 19:59:24 -08:00
Adam Powell
97b108532f am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair 
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp

* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
  Edge of screen slop detection for ScaleGestureDetector.
 2010-01-19 19:59:19 -08:00
Scott Main
5ed681561c am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair 
Merge commit 'de54a95b98b9d80c10ca2788b83386094222cb4f' into eclair-plus-aosp

* commit 'de54a95b98b9d80c10ca2788b83386094222cb4f':
  docs: add a section about debugging web pages with the Console APIs;
 2010-01-19 19:59:13 -08:00
Dianne Hackborn
5f64128568 am b1c4a2a3: Fix issue #2364506: Phone locked up while listening to music and attempting to download an update 
Merge commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7' into eclair-plus-aosp

* commit 'b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7':
  Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
 2010-01-19 19:59:04 -08:00
Scott Main
5615ca1979 docs: a lot of revision and expansion of the hello view tutorials 
includes new screenshots for some tutorials and a new sample images
zip file

Bug:2338253
 2010-01-19 19:46:02 -08:00
Xavier Ducrohet
3330927bdd ADT/Layoutlib: implement sweep gradient. 
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
 2010-01-19 18:51:06 -08:00
Robert Greenwalt
15abc90147 Cleanup of process-specific DNS. 
Backport of MR2 change 421c72b6.

Removes entries sooner.  A bug.
Doesn't add one for phone process at all.  This was intended to be removed long ago.

bug: 2329900
bug: 2377507
 2010-01-19 18:01:36 -08:00
Adam Powell
5910cb53ea Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair 2010-01-19 16:40:17 -08:00
Adam Powell
380b525220 Edge of screen slop detection for ScaleGestureDetector. 2010-01-19 16:33:46 -08:00
Scott Main
de54a95b98 Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair 2010-01-19 16:18:52 -08:00
Scott Main
6261d879e7 docs: add a section about debugging web pages with the Console APIs; 
revise and cleanup some of the other content.

Bug: 2353529
 2010-01-19 15:45:59 -08:00
Dianne Hackborn
b1c4a2a3b3 Fix issue #2364506: Phone locked up while listening to music and attempting to download an update 
Make sure calls into the notification manager are not done with the
activity manager lock held.

Change-Id: Ib53c3b9f46160d94ee1e7079b1a5123e0d1225d8
 2010-01-19 15:36:42 -08:00
Xavier Ducrohet
60e3c09ec0 am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair 
Merge commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp

* commit '6866daee6a18992e8f2c9a948e873bbfc2090fb0':
  ADT/Layoutlib: implement radial gradient.
 2010-01-19 14:53:52 -08:00
Ying Wang
3c05f1fbac am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair 
Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
  Add instrumentation as a source tag for proguard keep options.
 2010-01-19 14:53:47 -08:00
Xavier Ducrohet
6866daee6a Merge "ADT/Layoutlib: implement radial gradient." into eclair 2010-01-19 14:48:58 -08:00
Xavier Ducrohet
45a7c28598 ADT/Layoutlib: implement radial gradient. 
Also refactored some parts of LinearGradient to reuse them
in the radial gradient

Change-Id: I2ec69bd60190bd014217d989177dcc7269188dea
 2010-01-19 14:03:31 -08:00
Mike Reed
1e1a7a5017 Do not merge 
roll 1-line fix from master here. Fixes crasher when apps use custom fonts

fixes http://code.google.com/p/android/issues/detail?id=6030
 2010-01-19 16:40:31 -05:00
Ying Wang
b5fb50a133 Merge "Add instrumentation as a source tag for proguard keep options." into eclair 2010-01-19 11:55:12 -08:00
Guang Zhu
e0aed796f0 am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair 
Merge commit 'ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp

* commit 'ccec75e7a842f8ba26617406768206eb3be32222':
  Prevent orientation change from triggering activity recreation.
 2010-01-19 11:54:05 -08:00
Amith Yamasani
658dc0d4b0 am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair 
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp

* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
  Security fix in accessibility - don't read out password. # 2371557
 2010-01-19 11:53:59 -08:00
Guang Zhu
ccec75e7a8 Merge "Prevent orientation change from triggering activity recreation." into eclair 2010-01-19 11:53:00 -08:00
Guang Zhu
4ddcedeff1 Prevent orientation change from triggering activity recreation. 2010-01-19 11:51:44 -08:00
Amith Yamasani
b35b8c1334 Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair 2010-01-19 11:50:39 -08:00
Scott Main
d603e989f4 am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit '88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp

* commit '88e653f6653aeb237631681f6700f0e572779617':
  docs: some spelling typos
 2010-01-19 11:21:58 -08:00
Scott Main
88e653f665 Merge "docs: some spelling typos" into eclair 2010-01-19 11:18:39 -08:00
Scott Main
13244e52eb docs: some spelling typos 2010-01-19 11:12:07 -08:00
Grace Kloba
76c29e633f am f167c4bf: DO NOT MERGE 
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp

* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
  DO NOT MERGE
 2010-01-18 23:43:37 -08:00
Grace Kloba
b869c59446 am 17b14bd3: DO NOT MERGE 
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp

* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
  DO NOT MERGE
 2010-01-18 23:43:32 -08:00
Grace Kloba
55d791e74e am 5a0bf1f0: DO NOT MERGE 
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp

* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
  DO NOT MERGE
 2010-01-18 23:43:27 -08:00
Grace Kloba
8d4baa7893 am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp

* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
  If ZoomButttonsController detects more than one pointer,
 2010-01-18 23:43:20 -08:00
Grace Kloba
3648f949ef am f080a5ad: Merge "DO NOT MERGE" into eclair 
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE
 2010-01-18 23:43:14 -08:00
Jim Miller
84928fa93c am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp

* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
 2010-01-18 23:43:01 -08:00