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
Martijn Coenen
b288f99334 am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit '1eca250b9dad45893fead128539f112cbc513496':
  Fix disableForegroundNdefPush crash.
 2011-10-31 22:54:43 +00:00
Fabrice Di Meglio
ad41b7c0d4 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances" 2011-10-31 15:53:54 -07:00
Martijn Coenen
1eca250b9d Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Jim Miller
5750b1ffb7 Fix 5404916: Make layout fit on 480x800 hdpi device 
This fixes the layout to work on a 480x800 device.  Change required
not making the font scalable anymore as well as reducing the padding above
and below the clock to reduce the layout by 7 pixels.

Change-Id: I9a18c60bf89873b849069f1f52de1db727de668a
 2011-10-31 15:50:13 -07:00
Stephen Hines
a049184274 Fix potential segfault in RS watchdog. 
BUG=5544671

This initializes the watchdog structure properly. Without this fix, it is
possible to call LOGE with a garbage string value.

Change-Id: Ie05eb65f83eca938f18ac962794407d58c3f277f
 2011-10-31 15:42:40 -07:00
Martijn Coenen
deb0f20c3d Fix disableForegroundNdefPush crash. 
It crashed due to the fact that we're committing a fragment change
after onSaveInstanceState() is called. Instead, commit without
storing the state - as the NfcFragment is something that needs
to be setup explicitly anyway, it is not something the user
expects to be restored.

Bug: 5540962
Change-Id: I5a8cd0e47306f2bbc14b592a0182083bb79cb21a
 2011-10-31 15:42:13 -07:00
Fabrice Di Meglio
5beeda08a7 Fix bug #5504346 Hung in native_getTextRunAdvances 
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
 2011-10-31 15:26:11 -07:00
Peter Ng
9359979c75 spinner focused states pumped up 
-old spinner states were not visible enough, pumped up the background to solve the issue

Change-Id: I4317d2aeef04409df5be1cca47ced91a5a564f76
 2011-10-31 15:20:47 -07:00
The Android Open Source Project
869c8ca08d am d59daca8: Reconcile with ics-mr0-release 
* commit 'd59daca890329fb6aee434cacd1136f40e9e487a':
 2011-10-31 22:13:43 +00:00
Tom Taylor
70816999f9 am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 
* commit 'adfe6383ee963b890bfbf319d219a23164804925':
  NPE in Threads.getOrCreateThreadId(Telephony.java:1275)
 2011-10-31 22:13:39 +00:00
The Android Open Source Project
ad78155c22 am d7f36121: am 50d0511d: Reconcile with ics-factoryrom-2-release 
* commit 'd7f36121f64fbbfaf640f073e01c43441b149d97':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-10-31 22:13:37 +00:00
Adam Powell
1648a39932 am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 
* commit '1759af3bc8a8f1346e3fb95351ed8037f38526d8':
  Bug 5535639 - Monkeys mad at FragmentManager
 2011-10-31 22:13:33 +00:00
Winson Chung
9721d3c56e am 650ee281: Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1 
* commit '650ee281ae9e007ce82ea79ff18bab9ef49503de':
  Using fast-invalidate pattern for screenshot animations.
 2011-10-31 22:13:26 +00:00
Marco Nelissen
ab9b7091fc am 6d4b9f0b: Merge "Make MediaController use low profile system UI" into ics-mr1 
* commit '6d4b9f0b409dd15d8ada0a990f9c5785bdbd2e9f':
  Make MediaController use low profile system UI
 2011-10-31 22:13:21 +00:00
Alex Sakhartchouk
5889ce79bc am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1 
* commit '66ce1fce59d2dc16f1905120e0fe3851ba1add90':
  Removing changes not meant for MR1
 2011-10-31 22:13:19 +00:00
Michael Jurka
69cde42890 am b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1 
* commit 'b4529b0adca243644f601c9fe5d419c283bf57c1':
  HorizontalScrollView should delay child presses
 2011-10-31 22:13:16 +00:00
Amith Yamasani
468825f60a am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 
* commit '18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
 2011-10-31 22:13:08 +00:00
Jeff Brown
fa59cfbc85 resolved conflicts for merge of bce45617 to master 
Change-Id: Ieb966e674dca3ec46cd3cd25e4de281f1be747c2
 2011-10-31 15:10:10 -07:00
Pannag Sanketi
dd79b4c85a Merge "Expose video stabilization API" into ics-mr1 2011-10-31 15:05:19 -07:00
Nick Pelly
cccf01d3e2 API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS. 
Modify isNdefPushEnabled() semantics slightly - true only if isNfcEnabled && NDEF push enabled.

Fix up docs.

Change-Id: Icd2df9c636ecf2d8274851bbda423f2eae7bac5f
 2011-10-31 14:49:40 -07:00
Mangesh Ghiware
ca4d54c486 Clamp initial scale between minimum and maximum values. 
Fixes bug 5515454: web page is not optimized (gmarket)

Initial scale is used to detect mobile sites
In ICS, mobile site detection based on whether the URL included m.,
mobile., wap., etc. has been removed in exclusive favor of the meta
viewport tag.

Within meta viewport tag, mobile site detection uses width (set to
device-width), initial-scale (set to 1.0 or default scale), etc. Make
this logic more robust by clamping initial scale between minimum and
maximum values, if specified.

Change-Id: I663c50ce20b35279d37a8c812e91d6bc4c16c1d3
 2011-10-31 14:41:38 -07:00
Andreas Huber
796da70392 Support new HLS byte-range extensions 
Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
 2011-10-31 14:25:16 -07:00
Pannag Sanketi
d47823e359 Expose video stabilization API 
Related to bug:5469735

Change-Id: I0a8245b37eed7f2cb58d35c7a9a7b3b293b64694
 2011-10-31 14:17:46 -07:00
Svetoslav Ganov
62015f5d0d am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit 'aeb11b598877523fd3c530c7a086c38b4a13c7a1':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:30:30 +00:00
Svetoslav Ganov
aeb11b5988 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -07:00
The Android Open Source Project
d59daca890 Reconcile with ics-mr0-release 
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
 2011-10-31 13:06:22 -07:00
Tom Taylor
adfe6383ee Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 2011-10-31 12:51:19 -07:00
The Android Open Source Project
d7f36121f6 am 50d0511d: Reconcile with ics-factoryrom-2-release 
* commit '50d0511ddbf226255347e95a6382af8b0e7d366b':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-10-31 19:45:33 +00:00
The Android Open Source Project
50d0511ddb Reconcile with ics-factoryrom-2-release 
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
 2011-10-31 12:43:39 -07:00
Adam Powell
1759af3bc8 Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 2011-10-31 12:37:58 -07:00
Eric Laurent
8ca9a1cf35 Fix volume indication in vibrate mode. 
The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
 2011-10-31 12:12:37 -07:00
Adam Powell
37510908a7 Bug 5535639 - Monkeys mad at FragmentManager 
Also check for starting deferred start fragments when a loader is
destroyed.

Change-Id: Ia17a902c579c09d7ac01079c7c1da137635aa08b
 2011-10-31 11:48:24 -07:00
Gilles Debunne
e9b82808d4 No threading issues in SpellChecker. 
SpellChecker is exclusively called from the main UI thread and
there are no concurrency issues. As a result, the TextView's
wordIterator can safely be re-used in the parse() method.

Also reset the pool of SpellParsers on language change.

Change-Id: I1cc8a2750f21233754f006e40a81622730030ec8
 2011-10-31 11:38:40 -07:00
Tom Taylor
fbf1d27d24 NPE in Threads.getOrCreateThreadId(Telephony.java:1275) 
Bug 5541883
Remove obsolete debug statement.

Change-Id: I8d2f6e33f36c920838460bca7a1db117dd0edf7b
 2011-10-31 11:15:06 -07:00
Winson Chung
650ee281ae Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1 2011-10-31 10:54:12 -07:00
Marco Nelissen
6d4b9f0b40 Merge "Make MediaController use low profile system UI" into ics-mr1 2011-10-31 10:46:33 -07:00
Alex Sakhartchouk
66ce1fce59 Merge "Removing changes not meant for MR1" into ics-mr1 2011-10-31 10:30:37 -07:00
Marco Nelissen
d763c2cbe8 Make MediaController use low profile system UI 
This makes the MediaController iused by the full screen html5 video
view copy the system ui visibility of its owner. Some issues remain.
b/5494143

Change-Id: I6b157226974befbee5ba685d42d1ef72c113664d
 2011-10-31 08:34:24 -07:00
Eric Fischer
c86b8730e8 am 94e08f40: (-s ours) am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '94e08f40936b6a280f404e8b67cb5ef900747258':
  Import revised translations.  DO NOT MERGE
 2011-10-31 12:26:51 +00:00
Scott Main
0c91855c0b am 5079909b: am 8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0 
* commit '5079909b8b8fe2e629e0a0b86882e6c15b07ae53':
  docs: fix spell checker client location
 2011-10-31 12:26:33 +00:00
Joe Fernandez
eba186448f am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 
* commit '74b2b9547329a0b05e0bd5701057696007b854bb':
  docs: add developer guide cross references, Project ACRE, round 3
 2011-10-31 12:26:31 +00:00
Justin Ho
b0ac8ed483 am 76756a42: am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0 
* commit '76756a42dd68062349158f70d9b0ab95db908acc':
  Vertically center the landscape navigation bar.
 2011-10-31 12:26:30 +00:00
satok
d412f9f15b am 4a6d0879: Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1 
* commit '4a6d0879465ea6eb52b2b75e9fa2a4a84e1b0d86':
  Add a flag for recommended suggestions of the spell checker
 2011-10-31 12:26:23 +00:00
satok
266d9ad1f8 am f0fd595f: Merge "Hide ime switcher when the screen is turned off." into ics-mr1 
* commit 'f0fd595f0f3203fb81cb39a367b2a06647db907d':
  Hide ime switcher when the screen is turned off.
 2011-10-31 12:26:21 +00:00
Dianne Hackborn
648fe071d4 am 7801612b: Merge "Add some IO tests." into ics-mr1 
* commit '7801612b4f66e3c9cf58d24cffa8ce72e43adc57':
  Add some IO tests.
 2011-10-31 12:26:19 +00:00
Dianne Hackborn
f82621dc3c am e02c88af: Work on process management. 
* commit 'e02c88af7935c72fb90a478375e61e4a94465587':
  Work on process management.
 2011-10-31 12:26:15 +00:00
Adam Powell
aa7cbf90ca am 678ed0c5: Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances. 
* commit '678ed0c5a32bac1ea18a5ac99b0b814421ea79b4':
  Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-10-31 12:26:08 +00:00
satok
2520ed8cc3 Resolve memory leak in TextServicesManagerService 
Bug: 5499490
Change-Id: I3537b0d733a53d4783902a545cd9ecc7e4c2eac1
 2011-10-31 19:38:05 +09:00
Michael Jurka
b4529b0adc Merge "HorizontalScrollView should delay child presses" into ics-mr1 2011-10-30 19:41:24 -07:00
Amith Yamasani
18936d7d1d am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
 2011-10-30 21:37:09 +00:00