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

61388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
3fab14c29e Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773" 2011-11-07 14:33:35 -08:00
Jim Miller
aa87fd03ff am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 
* commit '4d8ecc65c5a747f350492b21397d7466ff628900':
  Fix 5231823: PIN/Password polish on lock screen
 2011-11-07 22:29:08 +00:00
Jim Miller
4d8ecc65c5 Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 2011-11-07 14:24:43 -08:00
Jeff Brown
5c7d5a4a35 Merge "Fix possible leak in Parcel::writeDupFileDescriptor." 2011-11-07 14:05:22 -08:00
Peter Ng
6918bca7f8 am a50c859d: Merge "Color balancing framework assets" into ics-mr1 
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
  Color balancing framework assets
 2011-11-07 21:44:33 +00:00
Peter Ng
a50c859d3f Merge "Color balancing framework assets" into ics-mr1 2011-11-07 13:40:45 -08:00
Peter Ng
4f4882ad12 Color balancing framework assets 
-btns are more opaque
-toggle buttons are now blue
-spinners have better antialiasing
-quick contacts have a thicker divider
-switches are flipped

Bug:5560030
Change-Id: I28f64aa2be6c7f0d8c82e9b7c318aaf2bfd98ea7
 2011-11-07 13:16:36 -08:00
Justin Ho
1cd8ca39d9 Merge: Correctly updating Roboto HHEA table to master 
Bug: 5516773

The last change regressed a few glyphs since the wrong file was checked in

Change-Id: Id1cceef5ddf6aa7215a86159b66006dca675ce44
 2011-11-07 13:13:46 -08:00
Eric Fischer
d3ba4ce1c9 am 08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
  Import revised translations.  DO NOT MERGE
 2011-11-07 20:41:00 +00:00
Eric Fischer
08be43a6d9 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:36:02 -08:00
Eric Fischer
2f6172e35a Import revised translations. DO NOT MERGE 
Change-Id: Ib095d85d01ffce5201d1e91d7c90c516f8c4c89c
 2011-11-07 12:34:57 -08:00
Jeff Brown
df4ee721cb Fix possible leak in Parcel::writeDupFileDescriptor. 
Also, check the result of dup() just in case we got EMFILE
or something.

Change-Id: I18e627bd84f4c7941813fe1c2bad2cdd9e5afa83
 2011-11-07 12:22:39 -08:00
Amith Yamasani
ff92dd69af am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1 
* commit '7919bfb12365b3f84e232235c35df957039995b7':
  Don't show the submit button when it isn't enabled.
 2011-11-07 19:01:22 +00:00
Amith Yamasani
7919bfb123 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00
Winson Chung
48dd388045 am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1 
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
  Fixing screenshot border asset.
 2011-11-07 18:24:01 +00:00
Winson Chung
19c86cacb2 Merge "Fixing screenshot border asset." into ics-mr1 2011-11-07 10:20:37 -08:00
Daniel Sandler
4f631bbf97 am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1 
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
 2011-11-07 18:15:30 +00:00
Daniel Sandler
010bb273a5 Merge changes I0da0f04f,I93197665 into ics-mr1 
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
 2011-11-07 10:11:52 -08:00
Alex Sakhartchouk
9829cceca1 Merge "Properly passing an unused variable through." 2011-11-07 09:53:28 -08:00
The Android Open Source Project
01b35d7b1c Reconcile with ics-mr1-release 
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
 2011-11-07 08:30:54 -08:00
The Android Open Source Project
8258c52b82 am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
  Fix a leak in Parcel::writeBlob.
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-07 16:28:26 +00:00
The Android Open Source Project
064975c27c Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
 2011-11-07 08:22:56 -08:00
Dianne Hackborn
973f8f20c4 am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0 
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
  Print out memory info when we get into a low memory situation.
 2011-11-07 15:51:38 +00:00
Mathias Agopian
9e079d8fa0 am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1 
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
  workaround to set the WM refresh rate to 48 Hz for tuna devices only
 2011-11-07 15:51:33 +00:00
Jeff Brown
bd79a9c9f3 am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob. 
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1':
  Fix a leak in Parcel::writeBlob.
 2011-11-07 15:51:31 +00:00
Steve Block
2abb2abea0 Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0 
* changes:
  Add tests for the fields of objects in the WebView's Java Bridge.
  Adds a set of basic test for WebView's Java Bridge
  Add tests for returning values from WebView's Java Bridge
  Adds a new test for type coercion in WebView's Java Bridge
 2011-11-07 07:37:53 -08:00
Steve Block
2dc592a4ae Add tests for the fields of objects in the WebView's Java Bridge. 
Bug: 5140673
Change-Id: If1bdd547c09d37bbf6d649f15388352ee76f4887
 2011-11-07 15:34:30 +00:00
Steve Block
f7e26448c3 Adds a set of basic test for WebView's Java Bridge 
Bug: 5140673
Change-Id: Ie43c16aeca9c5982b4ea64e3b54ec1a33c5f7241
 2011-11-07 15:00:43 +00:00
Steve Block
d100cdbcc8 Add tests for returning values from WebView's Java Bridge 
Bug: 5140673
Change-Id: I62b45f8b35be3ce9c76766e39e8867c028f94ac1
 2011-11-07 15:00:39 +00:00
Steve Block
2d803903af Adds a new test for type coercion in WebView's Java Bridge 
This change adds a new directory of tests for the WebView, WebViewTests.

It also provides the first in a set of tests to test WebView's Java Bridge.
Once this set of tests is complete, the Java Bridge test in
packages/apps/Browser will be removed.

Bug: 5140673
Change-Id: I32b7fdc0ac5d2231e6b96ff232d336ad2c0fcaab
 2011-11-07 14:54:51 +00:00
The Android Automerger
5951f7af86 merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:10 -08:00
The Android Automerger
ceb6cdf063 merge in ics-mr0-release history after reset to ics-mr0 2011-11-06 06:28:19 -08:00
Romain Guy
9039e43ab1 am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 
* commit '2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
  Memory optimizations for libhwui Bug #5566149
 2011-11-05 19:33:49 +00:00
Robert Greenwalt
08d153fb8e am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
 2011-11-05 19:33:46 +00:00
Jamie Gennis
aaa0336f88 am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 
* commit '2ab7ec90e4a6f21bee7cbfebbd751d32d4cf9e03':
  EGL: Add stubs for EGL_ANDROID_blob_cache
 2011-11-05 19:33:42 +00:00
Dianne Hackborn
941733e7d1 am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 
* commit '960177ae394a466d765a2dc171e136f9fdea06b6':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
 2011-11-05 19:33:39 +00:00
Dave Burke
4fa8f7f4ac am a3af4c94: am 3ee47188: Frame rate to 48 fps 
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
  Frame rate to 48 fps
 2011-11-05 19:33:33 +00:00
Mathias Agopian
5f43c96a71 am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1 
* commit '515c6b44d57b829792267594a355cd2831582197':
  fix an issue where SensorService could request an invalid sensor delay
 2011-11-05 19:33:18 +00:00
Irfan Sheriff
a4e1014d36 am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1 
* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
  Avoid quick shutdown after a  driver start
 2011-11-05 19:33:16 +00:00
Narayan Kamath
928f97b186 am eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1 
* commit 'eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
  Add an API for querying / enabling network TTS support.
 2011-11-05 19:33:11 +00:00
Chet Haase
2a639347ae resolved conflicts for merge of aa4d2f69 to master 
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
 2011-11-05 12:01:51 -07:00
Dianne Hackborn
3f3e8f0c37 am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1 
* commit '55fe6763d29cb0e899b2541497f4d8bc1bbd14ba':
  Include showmap output in bug report.
 2011-11-05 16:40:10 +00:00
Amith Yamasani
d291558b56 am d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 
* commit 'd69c203cd48c1d0d3be92fb0396656ee8adc1185':
  Close suggestions cursor when SearchView is detached.
 2011-11-05 16:40:07 +00:00
Flavio Lerda
2e428814cc am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1 
* commit '8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
  Add a query parameter to look-up a SIP address.
 2011-11-05 16:40:01 +00:00
Eric Laurent
3a8f6bedc3 resolved conflicts for merge of 914972be to master 
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
 2011-11-05 09:32:35 -07:00
Eric Laurent
9162e6b2f9 Merge "resolved conflicts for merge of 79178b8b to master" 2011-11-05 08:56:06 -07:00
Eric Laurent
f434fb50a6 resolved conflicts for merge of 79178b8b to master 
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
 2011-11-05 08:52:20 -07:00
Dianne Hackborn
6581043a44 am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0 
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
  Print out memory info when we get into a low memory situation.
 2011-11-05 07:34:03 +00:00
The Android Automerger
b655ee47c5 merge in ics-mr0-release history after reset to ics-mr0 2011-11-05 00:33:21 -07:00
Dianne Hackborn
7311bd4b70 Merge "Print out memory info when we get into a low memory situation." into ics-mr0 2011-11-05 00:31:17 -07:00