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

11903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Xavier Ducrohet
da84d6a1b1 am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 
Merge commit '908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp

* commit '908a81119061092468067789acbec9b99d79ad5f':
  ADT/Layoutlib: Add dash support to stroke.
 2010-01-18 23:42:55 -08:00
Xavier Ducrohet
c0ea805c64 am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair 
Merge commit '2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp

* commit '2b30a4a50e24080fdd8b796e4a64447f223d4522':
  ADT/Layoutlib: properly handle stroke information.
 2010-01-18 23:42:28 -08:00
Grace Kloba
f167c4bfca DO NOT MERGE 
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
 2010-01-18 15:30:59 -08:00
Grace Kloba
17b14bd36a DO NOT MERGE 
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.

This should fix the weird state Bart got in with
m.wikipedia.org.
 2010-01-18 15:29:46 -08:00
Grace Kloba
5a0bf1f03e DO NOT MERGE 
Remove testing (enable plugin) code.

No reflow when zoom in, auto reflow when zoom out.

Fix http://b/issue?id=2375955
 2010-01-18 15:29:46 -08:00
Grace Kloba
d79d1c7299 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 2010-01-18 15:21:38 -08:00
Grace Kloba
f080a5adf6 Merge "DO NOT MERGE" into eclair 2010-01-18 15:21:31 -08:00
Grace Kloba
d4d1d6eca0 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.
 2010-01-18 10:43:59 -08:00
Jim Miller
813d2d8678 Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 2010-01-15 17:20:29 -08:00
Grace Kloba
19c9df3c1d DO NOT MERGE 
Bring back +/- when panning. Dismiss it when pinching.
 2010-01-15 16:35:40 -08:00
Jim Miller
2cd1e6eda9 Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent. 
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent.
Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.

Instead, we'll handle this separately in lockscreen.
 2010-01-15 16:20:36 -08:00
Xavier Ducrohet
908a811190 Merge "ADT/Layoutlib: Add dash support to stroke." into eclair 2010-01-15 14:27:34 -08:00
Xavier Ducrohet
36ab1284d8 ADT/Layoutlib: Add dash support to stroke. 
Change-Id: I09a7e84948be013cbb11f6d9774ab81df897b424
 2010-01-15 11:24:44 -08:00
Xavier Ducrohet
2b30a4a50e Merge "ADT/Layoutlib: properly handle stroke information." into eclair 2010-01-15 10:30:52 -08:00
Xavier Ducrohet
5ac8f409f5 ADT/Layoutlib: properly handle stroke information. 
Change-Id: Iec9284d0e65d1313739e361d1fd5a522646fd1fd
 2010-01-14 19:43:54 -08:00
Grace Kloba
88196464e9 am 4d69ac66: Merge "DO NOT MERGE" into eclair 
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp

* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
  DO NOT MERGE
 2010-01-14 19:32:45 -08:00
Grace Kloba
c8cab72521 am d1019a99: Merge "DO NOT MERGE" into eclair 
Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp

* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
  DO NOT MERGE
 2010-01-14 19:32:39 -08:00
Grace Kloba
4d69ac6695 Merge "DO NOT MERGE" into eclair 2010-01-14 19:29:09 -08:00
Grace Kloba
d1019a99f9 Merge "DO NOT MERGE" into eclair 2010-01-14 19:28:55 -08:00
Xavier Ducrohet
20cc557033 am 79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 
Merge commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5' into eclair-plus-aosp

* commit '79f05bb4a502d5768f84cf975f791f3ba981e0e5':
  ADT/Layoutlib: improved gradient drawing for perf.
 2010-01-14 19:15:28 -08:00
Xavier Ducrohet
38fa9eee93 am 89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that. 
Merge commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be' into eclair-plus-aosp

* commit '89d538dcca9a4cb95682c56b0c4b85e8a77442be':
  ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
 2010-01-14 19:15:22 -08:00
Xavier Ducrohet
79f05bb4a5 Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair 2010-01-14 19:10:44 -08:00
Amith Yamasani
91ccdb5f10 Security fix in accessibility - don't read out password. # 2371557 
Check for password type before send accessibility event.
[Submitting for Svet]
 2010-01-14 18:56:02 -08:00
Xavier Ducrohet
e8f4d7deab ADT/Layoutlib: improved gradient drawing for perf. 
Change-Id: I79b909d7787e4442e7cfdf196de1ac0c077da7f8
 2010-01-14 18:45:04 -08:00
Xavier Ducrohet
895c92a44b am 240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 
Merge commit '240298f9e4542c487edd0337e84b50c493cbeecd' into eclair-plus-aosp

* commit '240298f9e4542c487edd0337e84b50c493cbeecd':
  ADT/Layoutlib: always use custom gradient (java) Paint.
 2010-01-14 18:39:48 -08:00
Xavier Ducrohet
89d538dcca ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that. 
Change-Id: I298d00208ace2421478c5864cc5a66a508b2b411
 2010-01-14 18:38:06 -08:00
Xavier Ducrohet
240298f9e4 Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair 2010-01-14 18:36:26 -08:00
Grace Kloba
fd787ba79d DO NOT MERGE 
When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.

Fix http://b/issue?id=2370552
 2010-01-14 18:30:45 -08:00
Grace Kloba
76336f2ccf DO NOT MERGE 
If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.

Fix http://b/issue?id=2375232
 2010-01-14 18:18:41 -08:00