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

63259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Svetoslav Ganov
a840462feb Folding Accessibility Service sample into ApiDemos. 
1. Moving Accerssibility Service sample into ApiDemos since
   we are putting all accessibility samples there.

Change-Id: If2deec7f6ad49b0d50112300eda0f7cb48660450
 2011-10-28 19:16:24 -07:00
Scott Main
5079909b8b am 8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0 
* commit '8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
  docs: fix spell checker client location
 2011-10-29 02:16:15 +00:00
Joe Fernandez
74b2b95473 am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
  docs: add developer guide cross references, Project ACRE, round 3
 2011-10-29 02:16:10 +00:00
Justin Ho
76756a42dd am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0 
* commit 'c1cf3b160b4852e021a45806d496a9f9a76d6683':
  Vertically center the landscape navigation bar.
 2011-10-29 02:16:08 +00:00
Amith Yamasani
69e640ee84 Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
Amith Yamasani
c696a53d1f Bring back the old-style Ring/Vibrate/Silent states when using volume keys. 
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
 2011-10-28 18:40:43 -07:00
satok
4a6d087946 Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1 2011-10-28 18:26:40 -07:00
satok
f0fd595f0f Merge "Hide ime switcher when the screen is turned off." into ics-mr1 2011-10-28 18:25:28 -07:00
Jeff Brown
2d280f754e Merge "Improve the slow query instrumentation." into ics-mr0 2011-10-28 18:21:05 -07:00
Dianne Hackborn
7801612b4f Merge "Add some IO tests." into ics-mr1 2011-10-28 17:33:39 -07:00
Eric Fischer
2cc1c5d067 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-28 17:29:12 -07:00
Dianne Hackborn
e02c88af79 Work on process management. 
Introduce a new concept of "B" services.  All running services are
classified as either A or B.  B services are later in the LRU list.
Their oom_adj is after the home app.  This allows us to better pick
services to kill based on how long they have running, and should
reduce the amount that we end up killing the home app.

This temporarly turns on a debug log when the oom_adj of a process
is changed.  Sorry, I know it is noisy.  This is needed to try to
track down why some processes are being killed.

Also add a flag to the SyncManager's service binding to allow the
syncing process to be more aggressively killed if it has done UI.
This is to address cases we have seen where sync is causing an 80MB
gmail process to be kept around, preventing other process from running.
Now what will happen is that the syncing process will aggressively be
killed by the system, and can then be restarted in a much lighter-weight
state.

Do a little tweak in the power manager to allow us to still do smooth
brightness changes even when the fancy TV off animation is in use.

And get rid of a debug log in the window manager that was accidentally
left in.

Change-Id: I64a8eeaaa1f096bab29c665fbff804c7f1d029e2
 2011-10-28 17:15:08 -07:00
Dianne Hackborn
2e9562ad76 Add some IO tests. 
Change-Id: Iacd5798a539781b67637cbbcc49cc8dec344e17b
 2011-10-28 17:12:12 -07:00
Eric Fischer
9853b74653 Import revised translations. DO NOT MERGE 
Change-Id: I1aaff923057636af5f68cc730d889adb201f9fc8
 2011-10-28 17:02:44 -07:00
Michael Jurka
9edd58e950 HorizontalScrollView should delay child presses 
In Recents in landscape, we were seeing blue flashes when scrolling; generally, almost every scrolling container should be delaying child presses to prevent this problem
 2011-10-28 16:40:07 -07:00
Scott Main
8dbe177c5d Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -07:00