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

61686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
e60e3e2b38 am 3869eac4: am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 
* commit '3869eac42b3d6fc0ecef8f096fbb4b5ddafca6f7':
  Introduce an API to cancel pending/running spell check tasks
 2011-11-10 19:39:08 +00:00
Daniel Sandler
4e637a9fa5 am 9cc4efb3: am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1 
* commit '9cc4efb39054557cfac11e0c7ba5887f102579d3':
  Use platform assets for brightness scrubber.
 2011-11-10 18:51:15 +00:00
Wink Saville
407f8973bd am f1633291: am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 
* commit 'f1633291aa13ee1bd210a38e007b9e133c178f37':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
 2011-11-10 18:51:11 +00:00
satok
c95b7412c2 am 3628dafe: am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 
* commit '3628dafe22aeeb2fca09b49d82c8d7289baf68ad':
  Respect user settings for spell checking language if explicitly set
 2011-11-10 18:34:45 +00:00
Mathias Agopian
9a2c95f0fc am c2e3b33b: (-s ours) am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE 
* commit 'c2e3b33b1f2399a9165b94b42dda46535bb857bf':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
 2011-11-10 18:34:41 +00:00
Steve Block
5511bb3ce2 Merge "Add tests for arrays in WebView's Java Bridge" 2011-11-10 08:44:57 -08:00
Steve Block
47538c081d Add tests for arrays in WebView's Java Bridge 
Also fixes some minor problems in other tests and reduces the HTML test page to
the minimal valid HTML5 document.

Bug: 5140673
Change-Id: Icc3730d017b778b0e618af3fcfee028300dd0a56
 2011-11-10 16:42:05 +00:00
Tsu Chiang Chuang
7746a8ff36 Merge "Adding mobile microbenchmark tests." 2011-11-10 08:16:04 -08:00
Jim Miller
524a0adeb5 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 
* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
 2011-11-10 16:15:14 +00:00
Eric Fischer
94eb382344 am bf3f6f42: (-s ours) am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'bf3f6f42775910544b9292ac1eb8bcdf1d1696d3':
  Import revised translations.  DO NOT MERGE
 2011-11-10 16:15:12 +00:00
Robert Ly
c04bdb94d6 am 07e95523: am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0 
* commit '07e9552308a1ba49312931b193c06cb6ba822d22':
  docs: update samples toc for rs sample
 2011-11-10 16:14:53 +00:00
Jamie Gennis
715bcd6d5b am 1bf15e79: am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1 
* commit '1bf15e79dcc89229c599987ed795e3fd99bcbc88':
  EGL: add deferred saving of the cache
 2011-11-10 16:14:45 +00:00
Jeff Brown
fe2d4abdd9 am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 
* commit '698d3de681bf85047675baa61f9b28961f3d6862':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
 2011-11-10 16:14:43 +00:00
Peter Ng
1c3ce05b7c am cf83c070: am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1 
* commit 'cf83c070e3caa3ee6e5df8a4e6545ae43cb08a35':
  Making quicksettings opaque again
 2011-11-10 16:14:40 +00:00
Gilles Debunne
d1cd3e7b76 Merge "Fix bug #5544127 TextView regression in ICS when setting TextSize dynamically" 2011-11-10 08:13:55 -08:00
Gilles Debunne
33c25e4933 Merge "Bug 5575396: close spell session on language change" 2011-11-10 02:10:45 -08:00
John Reck
e9a291e781 am 0e17f653: am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '0e17f65312e57c7f1489010284987c505142b778':
  Fix determining find on page overlap
 2011-11-10 05:42:49 +00:00
The Android Open Source Project
820eb97c7b am ef725e83: am eae6c997: Reconcile with ics-mr0-release 
* commit 'ef725e83acce5fc7904a5a47aac501fc0e8ea3c6':
 2011-11-10 05:42:44 +00:00
Jean-Michel Trivi
d43759f0bc am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1 
* commit '036da41922c936d25b36fbc4b5927a0097ece330':
  Bug 5585323 New system permission for media decode
 2011-11-10 05:42:39 +00:00
satok
3869eac42b am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
  Introduce an API to cancel pending/running spell check tasks
 2011-11-10 05:28:47 +00:00
satok
114c4d3843 Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 2011-11-09 21:26:46 -08:00
Daniel Sandler
9cc4efb390 am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1 
* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
  Use platform assets for brightness scrubber.
 2011-11-10 04:42:15 +00:00
Daniel Sandler
bca520a170 Merge "Use platform assets for brightness scrubber." into ics-mr1 2011-11-09 20:41:03 -08:00
Wink Saville
f1633291aa am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 
* commit '08b3ffe61182b60ded3bfa599778b6f5495e87db':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
 2011-11-10 03:44:27 +00:00
Wink Saville
08b3ffe611 am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 
* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
 2011-11-10 03:42:09 +00:00
Wink Saville
16ee60a5ae Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 2011-11-09 19:39:39 -08:00
Wink Saville
6fc3ca7e19 Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes. 
Initially set to 3 minutes this raised the standby current
by 12.5% so changing to 6 minutes.

Bug: 5534004
Change-Id: I602f5fe4de35d0db2dbacf0c615c300c57dd2d0d
 2011-11-09 18:53:08 -08:00
satok
b4aff97c85 Introduce an API to cancel pending/running spell check tasks 
Bug: 5554629

Change-Id: Ifd840ea13976813639a2ee259124a21d9bb56893
 2011-11-10 11:50:45 +09:00
satok
3628dafe22 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
 2011-11-10 02:44:24 +00:00
satok
34bd596935 Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 2011-11-09 18:42:48 -08:00
Fabrice Di Meglio
d4c3b8e106 Fix bug #5544127 TextView regression in ICS when setting TextSize dynamically 
- nullify cached font metrics when we are nullifying the layouts as a result of changing text size

Change-Id: I372e4fad336de4aac89e1344c3e8d34c4e914f2f
 2011-11-09 18:12:38 -08:00
David Brown
17fe6c8d07 am 6e82e95c: am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0 
* commit '6e82e95c08bd1e2c46837e9ddb8759e5ca977f84':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
 2011-11-10 01:11:37 +00:00
Glenn Kasten
f8a0a30375 am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '874641f1331f3b37e8b2d930ed942fb6ca522501':
 2011-11-10 01:11:35 +00:00
Jake Hamby
f56b5bb074 am 0fc2847b: am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit '0fc2847bd5ad1997e04c73e33a258511d5388569':
 2011-11-10 01:11:34 +00:00
Eric Laurent
b755d53024 am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1 
* commit 'db7d79e6f1e1860a9bfe4756a03c753435fd0ddf':
  Fix regression for SoundPool playback
 2011-11-10 01:11:28 +00:00
Brian Colonna
a8a1bf7ab1 am c8c5bc44: am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit 'c8c5bc443fe63e96c91fc96bf8db8ce7dd177073':
 2011-11-10 01:11:26 +00:00
Mathias Agopian
c2e3b33b1f am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE 
* commit '42694dc4a7af4f38e39cb26a852f3f75e730bb05':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
 2011-11-10 00:44:27 +00:00
Mathias Agopian
42694dc4a7 am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE 
* commit '3e458306b0caf4e21294acc58286b24bda08a242':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
 2011-11-10 00:41:43 +00:00
Marco Nelissen
567354474f Bug 5575396: close spell session on language change 
Cherry pick change 8b67db17ec91956023e25674efe28a1f5ca970c8 from ics-mr1

Change-Id: I8166859e435f034535510a36772644cde3923cd9
 2011-11-09 16:07:33 -08:00
Gilles Debunne
cbf9d14012 am 7e7b4e7c: (-s ours) am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1 
* commit '7e7b4e7c822e7c9aacbe4add52511079cff757cc':
  Bug 5575396: close spell session on language change
 2011-11-10 00:03:56 +00:00
Mathias Agopian
3e458306b0 Set the WM refresh rate to 60 Hz for tuna devices only DO 
NOT MERGE

This approach is TEMPORARY until we can do this properly.

Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
 2011-11-09 16:01:07 -08:00
Jim Miller
5943c1dc40 am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
 2011-11-09 23:21:39 +00:00
Eric Fischer
bf3f6f4277 am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '6b992090f6eb1e14553be22373799258bb401e3d':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:21:38 +00:00
Jim Miller
270826a887 Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 2011-11-09 15:19:31 -08:00
Eric Fischer
6b992090f6 am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '3124bf64404dbb90cc521abf4c7bf8d438346362':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:18:10 +00:00
George Mount
a2c9f2707b Merge "Set the initial scroll position for RTL." 2011-11-09 15:15:42 -08:00
Eric Fischer
3124bf6440 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-09 15:15:42 -08:00
satok
05f2470061 Respect user settings for spell checking language if explicitly set 
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
 2011-11-10 07:54:52 +09:00
Andreas Huber
b516b96d88 Merge "Instead of asserting, remove active streams if their sockets return failure" 2011-11-09 14:47:51 -08:00
George Mount
e263bc1a36 Set the initial scroll position for RTL. 
Bug 5268793
 Webkit knows about the correct initial position for web pages.
 On initial show, scroll to the webkit position.

 External WebKit CL: I6a91b97f

Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
 2011-11-09 14:43:55 -08:00