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

60841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jesse Wilson
ddcc3a53d1 Merge "Interpret '+' as a space char in the URL query params." 2011-10-29 10:14:34 -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
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
Svetoslav Ganov
ff35661b5d Merge "Fixing the build breakage due to bad merge." 2011-10-28 16:42:06 -07:00
Svetoslav Ganov
f31aba7346 Fixing the build breakage due to bad merge. 
Change-Id: I2804bccc44e061229c3f7b2ad9e00b9e0a0ba916
 2011-10-28 16:41:13 -07:00
Peter Ng
876e700841 resolved conflicts for merge of e10462e3 to master 
Change-Id: I1c5a4fd1573583cd365b375835038e7e4a34f201
 2011-10-28 16:09:36 -07:00
Scott Main
8dbe177c5d Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -07:00
Scott Main
2323e9bcdc docs: fix spell checker client location 
Change-Id: Ic94eab2720cd96b1130869d2071c635b4acb27f5
 2011-10-28 15:55:39 -07:00
Peter Ng
17cfc6ee37 am 146d018f: Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1 
* commit '146d018f2083ec435ad76c18302cd9e2496ef4d8':
  Checkbox and radio button assets are sharper and blue
 2011-10-28 22:44:18 +00:00
Chet Haase
59d04a0ce4 am d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1 
* commit 'd568bba507b0f66d4d57c67b08ade894d2c75e53':
  Optimize handling of scrolled wallpapers
 2011-10-28 22:44:16 +00:00
Svetoslav Ganov
f79f476fd1 resolved conflicts for merge of c00d2ddc to master 
Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62
 2011-10-28 15:40:32 -07:00
Joe Fernandez
09848bc89d Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 2011-10-28 15:40:11 -07:00
Jesse Wilson
0f28af209a Interpret '+' as a space char in the URL query params. 
This changes Uri.decode() to use libcore's implementation
of the same behavior.

Bug: http://code.google.com/p/android/issues/detail?id=21064
Change-Id: If81005492b12d3aaecc745471e0a28679544a391
 2011-10-28 18:31:52 -04:00
Eric Fischer
5b9c79f27e am 220d2b0a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '220d2b0aa126fbe09dee9e7e9afa1999521cf5d2':
  Import revised translations.  DO NOT MERGE
 2011-10-28 22:27:54 +00:00
Gilles Debunne
19b51382a5 am a068e2f1: am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0 
* commit 'a068e2f1d9532e6f005a162adfa295c553873ca5':
  Text handles do not handle scroll correctly
 2011-10-28 22:27:50 +00:00
The Android Open Source Project
edd6ad8cd4 am 58ba1b61: Reconcile with ics-mr0-release 
* commit '58ba1b6121a9f11bc1ba40eb5b267033bbf2fafb':
  Revert "Clean up CursorWindow code."
  Revert "Restore broken CursorWindow.getType behavior."
  Revert "Clean up CursorWindow lifetime."
  Revert "Fix regression in CursorWindow.copyStingToBuffer."
  Revert "Fix regression in CursorWindow.getString()"
  Revert "Clean up handrolled Binder proxies."
  Revert "Fix ownership of CursorWindows across processes."
  Revert "Use ashmem for CursorWindows."
 2011-10-28 22:27:47 +00:00
Jeff Sharkey
195ffd3a13 am cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1 
* commit 'cc16024f101c0fca211fcd069b3917becf7a3c00':
  Differentiate between system_server and unknown.
 2011-10-28 22:27:38 +00:00
Daniel Sandler
056f4ea6b7 am 4c7926fa: Merge "Tuning parameters for mobile RSSI." into ics-mr1 
* commit '4c7926fa27dacb92c8c7f3d57c4a3713dc0e3867':
  Tuning parameters for mobile RSSI.
 2011-10-28 22:27:37 +00:00
Raphael
b53aab7d81 am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge. 
* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
  Cherry-pick f51125d from master to ics-mr0. do not merge.
 2011-10-28 22:27:22 +00:00
Peter Ng
d714e3a1ff am 63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1 
* commit '63dd319ebeea0421f8bf901b85b753dde1de74d7':
  Lockscreen on tablet is now using the same waveview widget as phone
 2011-10-28 22:27:13 +00:00
Adam Powell
1bc7d4b192 am 65793dc0: Merge "Add API for deferring fragment start." into ics-mr1 
* commit '65793dc043eee43790137f79beeba7ed8b123902':
  Add API for deferring fragment start.
 2011-10-28 22:27:12 +00:00
Adam Powell
678ed0c5a3 Bug 5275928 - Don't try to open an overflow menu under invalid circumstances. 
Change-Id: I62ea1e982f0d3c92cb504efbae95bce238b12f72
 2011-10-28 15:26:50 -07:00
Gilles Debunne
e03ba026c6 Merge "Performance improvement in TextView" 2011-10-28 15:26:22 -07:00
Gilles Debunne
4e13ebed6b Merge changes I2082e3d0,Ibf8e9827 
* changes:
  Scroll performance improved in multiline TextEdit
  Performance improvements for long text edition.
 2011-10-28 15:26:07 -07:00
Peter Ng
e10462e384 Merge "Stat_notify visual asset updates" into ics-mr1 2011-10-28 15:20:56 -07:00