Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
409 Commits 3 Branches 0 Tags
48554fc78e981590708cc2cb78ce3c09642e2c4d
Commit Graph

54 Commits

Author SHA1 Message Date
Romain Guy
aaf25b5a66 Merge branch 'readonly-p4-master' 2009-04-02 09:20:36 -07:00
Romain Guy
7fb60b9b4e AI 144080: No need to merge. Fix the build. 
Automated import of CL 144080
 2009-04-02 09:19:22 -07:00
Jeffrey Sharkey
5ed0ea8dbd Merge branch 'readonly-p4-master' 2009-04-02 08:56:44 -07:00
Jeffrey Sharkey
95a1b260fc AI 144005: Fix auto-merge method duplication that broke build. 
Automated import of CL 144005
 2009-04-02 08:55:32 -07:00
The Android Open Source Project
caee1703fe Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:25 -07:00
Jeffrey Sharkey
f0bc7ecebf AI 143909: am: CL 143908 am: CL 143907 Make search widget drop-down wider. 
Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143909
 2009-03-31 18:25:33 -07:00
Dianne Hackborn
7ac3f67c17 AI 143901: am: CL 143899 am: CL 143896 Fix issue #1748954 and #1737952: 
#1748954 (New status bar fades into all white background): FrameLayout wasn't updating its foreground drawable when its padding changed, which would happen as the status bar is shown and hidden.  To fix this I also ended up fixing a problem in the view debug stuff where we couldn't get a bitmap for a view that is the full screen size because it is too big...  actually I just went ahead and added another function to snapshot the view hierarchy which works a lot better for us anyway.
  #1737952 (Home screen icons overlap with the notification bar after exiting any camera app): Originally I punted this because it only happened in rare situations, but now that home is always portrait it happens a lot more so it is more important to fix.  This involved a few things to clean up hiding/showing the status bar:
  - We now determine when to hide and show it during layout, which allows us to do this at the time it is actually needed rather than during animation after we can actually catch it for the initial display of a window.  This required tweaking the layout API so the policy can request a second layout pass if needed.
  - When doing layout, we are now much more aggressive about skipping the layout of windows.  Basically anything that we know will be hidden in the near future is ignored for layout, so that it doesn't glitch as it is transfered out of the screen.  The theory being that it is better to leave it as it was originally placed while we are transitioning it out, than to switch it to something slightly more correct.
  Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143901
 2009-03-31 18:00:53 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal 
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
 2009-03-29 08:55:27 -07:00
Dianne Hackborn
1ca6a1ca84 AI 143364: am: CL 143214 am: CL 143009 More work on issue #1739507 (kila-user build is too big): remove some unused application resources I found. 
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143364
 2009-03-27 19:19:20 -07:00
Romain Guy
604ed546b7 AI 143281: am: CL 142990 Fixes #1739360. SimpleCursorAdapter was calling (unnecessarily) toString() on the Cursor even in the case where a ViewBinder was being used. This could cause crashes when the cursor was currently on a blob. This change defers the String conversion to the case where no ViewBinder is used. 
Original author: romainguy
  Merged from: //branches/donutburger/...

Automated import of CL 143281
 2009-03-27 16:58:23 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake' 
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
 2009-03-27 15:38:40 -07:00
Romain Guy
c4a5f87c7a AI 143240: am: CL 142790 am: CL 142788 Fixes #1730741. Marquee text was not always animated in context menus. 
The reason for that bug was that the marquee could potentially be stopped/started as part of the layout workflow. Unfortunately TextView was relying on setFrame() being called after onMeasure() which is *not* always the case, especially when the widget is inside of a ListView. This change simply checks for the marquee restart flag in on the onDraw() method in case we skipped the setFrame() step.
  Original author: romainguy
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143240
 2009-03-27 15:30:50 -07:00
Dianne Hackborn
2b4d828e1d Automated import from //branches/cupcake/...@143009,143009 2009-03-26 16:28:25 -07:00
Romain Guy
3661101005 Automated import from //branches/cupcake/...@142788,142788 2009-03-25 16:28:37 -07:00
Joe Onorato
062a75be9c Automated import from //branches/master/...@142308,142308 2009-03-24 22:34:00 -07:00
Romain Guy
9ea028f1e4 Automated import from //branches/master/...@142130,142130 2009-03-24 21:36:11 -07:00
Dianne Hackborn
8821192d5c Automated import from //branches/master/...@141350,141350 2009-03-24 20:05:40 -07:00
Romain Guy
696887ca50 Automated import from //branches/master/...@141315,141315 2009-03-24 20:01:32 -07:00
Jeff Hamilton
2c6b3b0c26 Automated import from //branches/master/...@141107,141107 2009-03-24 19:32:26 -07:00
Joe Onorato
aaf678a8a5 Automated import from //branches/cupcake/...@142233,142233 2009-03-24 19:20:16 -07:00
Dianne Hackborn
51bf077883 Automated import from //branches/master/...@141004,141004 2009-03-24 19:11:41 -07:00
Karl Rosaen
d9889787b2 Automated import from //branches/master/...@140913,140913 2009-03-24 18:55:23 -07:00
Romain Guy
dace7ff271 Automated import from //branches/master/...@140745,140745 2009-03-24 18:23:21 -07:00
Dianne Hackborn
1c9aefd471 Automated import from //branches/master/...@140719,140719 2009-03-24 18:18:28 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
The Android Open Source Project
7b0b1ed979 auto import //branches/master/...@140412 2009-03-18 22:20:26 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge 
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
 2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00
The Android Open Source Project
c39a6e0c51 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:56 -07:00
Jean-Baptiste Queru
69577ae794 Fix build. 
Change 9099 was a little bit too aggressive and removed a line it shouldn't have.
 2009-03-09 17:56:44 -07:00
Cyril Mottier
17ddd72f5c AbsSeekBar slightly optimized by removing a redundant snippet of code 2009-03-09 21:03:52 +01:00
The Android Open Source Project
b2a3dd88a5 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:12 -07:00
The Android Open Source Project
4df2423a94 auto import from //depot/cupcake/@136594 2009-03-05 14:34:35 -08:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856 auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
The Android Open Source Project
15ab3eae2e auto import from //branches/cupcake/...@132569 2009-02-20 07:38:31 -08:00
The Android Open Source Project
3001a03543 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:31 -08:00
The Android Open Source Project
da996f390e auto import from //branches/cupcake/...@131421 2009-02-13 12:57:50 -08:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
The Android Open Source Project
94cbba0933 Merge branch 'cupcake' 2009-01-22 00:16:08 -08:00
The Android Open Source Project
f1e484acb5 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:42 -08:00
The Android Open Source Project
7547115694 Merge branch 'cupcake' 2009-01-20 14:05:35 -08:00
The Android Open Source Project
22f7dfd234 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:58 -08:00
android-build SharedAccount
0fda766e53 Merge branch 'cupcake' 2009-01-15 16:16:01 -08:00
The Android Open Source Project
9266c558bf auto import from //branches/cupcake/...@126645 2009-01-15 16:12:10 -08:00
The Android Open Source Project
e570a0fa86 auto import from //branches/cupcake/...@125939 2009-01-09 18:24:37 -08:00
The Android Open Source Project
b798689749 auto import from //branches/cupcake/...@125939 2009-01-09 17:51:23 -08:00