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

60938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
3b1ead9b7a am a67217c3: Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 
* commit 'a67217c35ec43e06598b71feae63ce675fa9cac7':
  Fix 5404916: Make layout fit on 480x800 hdpi device
 2011-11-02 17:30:40 +00:00
Fabrice Di Meglio
31cbaca5f6 am deb15704: (-s ours) am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 
* commit 'deb15704e9abcfc71bb81a358ff3bb239896474d':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
 2011-11-02 17:30:39 +00:00
Mangesh Ghiware
d99e7accde am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 
* commit '00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
  Clamp initial scale between minimum and maximum values.
 2011-11-02 17:30:34 +00:00
Adam Powell
e5b7967989 am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 
* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
  Fix bug 5534667 - Action bar icons need more space on tablet
 2011-11-02 17:30:29 +00:00
Dianne Hackborn
9e9a64e875 am f136aa34: Merge "Various performance and other work." into ics-mr1 
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
  Various performance and other work.
 2011-11-02 17:30:26 +00:00
Peter Ng
2e59fe7eec am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1 
* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
  spinner focused states pumped up
 2011-11-02 17:30:25 +00:00
The Android Open Source Project
cdefffc480 am a0824452: am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit 'a0824452d5c511acc7d11396ff2e6423f7b03948':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-02 17:30:20 +00:00
Philip Milne
737f0118ea am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1 
* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
  Update to fix for bug 5393156
 2011-11-02 17:30:11 +00:00
Jim Miller
02829c30ae am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '2272602032e5051d5067a7a95c741304468a81af':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-02 17:29:49 +00:00
Chih-Chung Chang
25ba325ad3 am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
  Update camera continuous autofocus javadoc.
 2011-11-02 17:29:46 +00:00
satok
219e2c7821 am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 
* commit 'ff93e417a217703a635d8601b835853e07233afd':
  Resolve memory leak in TextServicesManagerService
 2011-11-02 17:29:35 +00:00
Adam Powell
a0684aafc8 am b1db20bd: Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 
* commit 'b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
  Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus
 2011-11-02 17:29:33 +00:00
Stephen Hines
293b27e458 am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
  Fix potential segfault in RS watchdog.
 2011-11-02 17:29:30 +00:00
Fabrice Di Meglio
3fb5048b02 Merge "Fix bug #5438102 Double Arabic harakat overlap instead of stack In TextView" 2011-11-01 17:25:22 -07:00
Fabrice Di Meglio
ef9bb3c3ea Fix bug #5438102 Double Arabic harakat overlap instead of stack In TextView 
IMPORTANT: this change needs two patches for Harfbuzz:
- one concerning hb_utf16_script_run_prev() which was not returning the correct "previous" script
- one for the "script_properties" table that was missing Arabic code point ranges and declaring
HB_Script_Inherited instead of HB_Script_Arabic

The current change is doing the following:
- pass the correct typeface for Harbuzz shaping (depending on the script of the run)
- offset correctly the glyphIDs returned by Harfbuzz

We need to offset the glyphsID as Harfbuzz will return local glyphIDs (meaning in the
local range of the font used for shapping).

We then cannot use those glyphIDs when we are using a fallback Font (Arabic, Hebrews...)
because the FontRenderer needs glyphIDs in the range of all the Fonts (including the fallbacks)

Change-Id: I494897435bbc59293b02392ee2059cebcdf0e571
 2011-11-01 17:16:08 -07:00
Eric Laurent
19774dda20 am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
  Fix volume indication in vibrate mode.
 2011-11-01 21:59:18 +00:00
Martijn Coenen
579117036b am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit 'b288f99334348a21ffb465b37a4522998b452410':
  Fix disableForegroundNdefPush crash.
 2011-11-01 21:59:16 +00:00
Pannag Sanketi
0d04c02a48 am dd79b4c8: Merge "Expose video stabilization API" into ics-mr1 
* commit 'dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
  Expose video stabilization API
 2011-11-01 21:59:09 +00:00
Svetoslav Ganov
25fd58aae3 am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit '62015f5d0d1104dfc682b3eb3b6c0be4f63b985a':
  Folding Accessibility Service sample into ApiDemos.
 2011-11-01 21:58:52 +00:00
Jim Miller
a67217c35e Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 2011-11-01 12:45:11 -07:00
Fabrice Di Meglio
deb15704e9 am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 
* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
 2011-11-01 19:42:48 +00:00
Fabrice Di Meglio
46e327ca32 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Andreas Huber
fe5f0aae65 Properly decode ADTS files with ID3 headers. 
Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
 2011-11-01 12:09:53 -07:00
Mangesh Ghiware
00ef15b98a Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 2011-11-01 11:28:01 -07:00
Adam Powell
ca4100da0a Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 2011-11-01 10:58:58 -07:00
Fabrice Di Meglio
26e9ee28de Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE 
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
 2011-11-01 10:49:44 -07:00
Dianne Hackborn
f136aa341a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
Peter Ng
374e23bd11 Merge "spinner focused states pumped up" into ics-mr1 2011-11-01 10:29:25 -07:00
The Android Open Source Project
a0824452d5 am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-01 17:10:39 +00:00
The Android Open Source Project
9eb4c891a3 Reconcile with ics-factoryrom-2-release 
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
 2011-11-01 10:08:15 -07:00
Philip Milne
3617933bee Merge " Update to fix for bug 5393156" into ics-mr1 2011-11-01 09:30:21 -07:00
Andreas Huber
688ff9a7d6 Merge "Support new HLS byte-range extensions" 2011-11-01 08:30:54 -07:00
Jim Miller
2272602032 am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-01 07:49:46 +00:00
Jim Miller
1dce37bd6b Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Adam Powell
24340afbab Fix bug 5534667 - Action bar icons need more space on tablet 
Set a wider minimum width for the action button style on -sw600dp.

Fix an annoying bug where recycled ActionMenuItemViews would retain a
lingering pressed state, causing an unrelated button to glow briefly.

The home/up affordance should not be focusable when it is disabled.

Change-Id: Ia68f3d09f5d977f50e4e33c354d8133367187973
 2011-10-31 22:11:24 -07:00
Nick Pelly
9fcc5ce71e Merge "API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS." 2011-10-31 22:09:10 -07:00
Chih-Chung Chang
11ba6da460 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
 2011-11-01 04:05:45 +00:00
Chih-Chung Chang
4b6353ea02 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
Jim Miller
9fa1ada318 Fix 5497305: Make sure we show SIM unlock when "None" is selected 
Previously the code ignored SIM state when lockscreen was set to "None."
It now properly accounts for the SIM state when deciding to show.

Change-Id: I272348c1a21b57ac146910850ea3db3adef0227c
 2011-10-31 18:21:49 -07:00
satok
ff93e417a2 Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 2011-10-31 18:20:48 -07:00
Adam Powell
b1db20bde5 Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 2011-10-31 18:18:33 -07:00
Gilles Debunne
93fdebb5ff Merge "No threading issues in SpellChecker." 2011-10-31 17:25:08 -07:00
Stephen Hines
af3a854b54 am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:16:56 +00:00
Stephen Hines
af675222f6 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
Dianne Hackborn
2c84cfc001 Various performance and other work. 
- IME service now switches between visible and perceptible depending on
  whether it is being showm, allowing us to more aggressively free its
  memory when not shown.

- The activity display time is no longer delayed by the activity
  transition animation.

- New -R (repeat) option for launching activities with the am command.

- Improved some documentation on Loader to be clear about some methods
  that apps should not normally call.

- FrameworkPerf test now allows you to select individual tests to run.

Change-Id: Id1f73de66dc93d63212183958a72119ad174318b
 2011-10-31 16:52:34 -07:00
The Android Automerger
3b25c4d845 Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-31 16:47:11 -07:00
Adam Powell
dcce1216b0 Fix bug 5514022 - ListView should not auto-scroll selected item to top 
when gaining focus

Change-Id: I9b82cba3d48a211b1d2017d66791bea466938cab
 2011-10-31 16:41:21 -07:00
Philip Milne
6b248641fc Update to fix for bug 5393156 
Tweak to the logic to take account of margins when gravity = FILL is used and
    there is a measurement dependency between the axes (as in mulit-line text).

Cherry pick ecab1178648670f2c72b47faf250040fcded3d13 to MR1

Change-Id: Ic0c95a4618bdb32acca75219796c66c1fc467610
 2011-10-31 16:26:55 -07:00
Eric Laurent
cd84197ac1 am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
 2011-10-31 23:23:15 +00:00
Eric Laurent
6e91e5b689 Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00