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

63430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Grossman
464a98151c Timesync: Improve logging and reject bad resps. 
+ Improve the state machine logging in the time server so we have some
  visibility into why it is doing the things it is doing.
+ Also, reject sync responses we receive from IP addresses which are
  not our current master.  Given the poor quality of the AAH WiFi
  network right now, we are thrashing a whole lot and can actually get
  into a state where this starts to happen.  Its easy to check and
  reject invalid responses, so do so.

Change-Id: I2318be3998c7f9f77bb25588d935f54394976875
 2011-10-31 16:34:24 -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
4528548a06 am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
  Fix volume indication in vibrate mode.
 2011-10-31 23:26:07 +00: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
Martijn Coenen
afacee4917 am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit 'b288f99334348a21ffb465b37a4522998b452410':
  Fix disableForegroundNdefPush crash.
 2011-10-31 22:56:08 +00:00
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
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
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
Pannag Sanketi
78e62359e3 am dd79b4c8: Merge "Expose video stabilization API" into ics-mr1 
* commit 'dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
  Expose video stabilization API
 2011-10-31 22:07:19 +00:00
Pannag Sanketi
dd79b4c85a Merge "Expose video stabilization API" into ics-mr1 2011-10-31 15:05:19 -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
Pannag Sanketi
d47823e359 Expose video stabilization API 
Related to bug:5469735

Change-Id: I0a8245b37eed7f2cb58d35c7a9a7b3b293b64694
 2011-10-31 14:17:46 -07:00
Svetoslav Ganov
71425a6ae9 am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit '62015f5d0d1104dfc682b3eb3b6c0be4f63b985a':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:32:43 +00: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
65e84a171d am d59daca8: Reconcile with ics-mr0-release 
* commit 'd59daca890329fb6aee434cacd1136f40e9e487a':
 2011-10-31 20:09:57 +00: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
4d338ba098 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 19:53:06 +00: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
8aa0e4e3fd 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 19:47:50 +00: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
0a9dd820eb am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 
* commit '1759af3bc8a8f1346e3fb95351ed8037f38526d8':
  Bug 5535639 - Monkeys mad at FragmentManager
 2011-10-31 19:39:10 +00: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
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
8bb9e0659e 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 17:57:02 +00: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
7346084872 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 17:48:07 +00: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
9ba3ea84d9 am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1 
* commit '66ce1fce59d2dc16f1905120e0fe3851ba1add90':
  Removing changes not meant for MR1
 2011-10-31 17:31:48 +00: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
Mike Lockwood
8e043cd5a4 Fix merge problem 
Change-Id: I8767e14c13760a9f3303fa31045d174ac9d73cd9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-31 10:30:29 -04:00
Ed Heyl
92537e6ff2 merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed) 
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
 2011-10-31 06:06:27 -07: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
Jeff Brown
bce4561708 resolved conflicts for merge of 2d280f75 to ics-mr1 
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
 2011-10-30 14:24:02 -07:00
The Android Automerger
22e65e4935 Revert "Improve the slow query instrumentation." 
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
 2011-10-30 13:56:11 -07:00
The Android Automerger
9ec258c86a merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-30 12:35:09 -07:00
The Android Automerger
0a21e6f2e4 merge in ics-mr0-release history after reset to ics-mr0 2011-10-30 06:29:10 -07:00
Dima Zavin
98e044a609 BatteryService(jni): properly handle read's return value 
Change-Id: I10f5cf3728424e7f5a0c1b460049102fd00a6246
Signed-off-by: Dima Zavin <dima@android.com>
 2011-10-28 23:15:11 -07:00
The Android Automerger
ce8e31ea5a Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-28 20:40:07 -07:00
Eric Fischer
94e08f4093 am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '2cc1c5d067736f221554be593c2ba2c96390f847':
  Import revised translations.  DO NOT MERGE
 2011-10-29 03:15:36 +00:00