ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
40,104 Commits 2 Branches 0 Tags 54 MiB
50fe8f3129
Commit Graph

40104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
50fe8f3129 am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0 
* commit '4eec98edee3d6eb516e30a7151da13fd726f93a9':
  Text handles do not handle scroll correctly
 2011-10-28 20:44:17 +00:00
Gilles Debunne
fc3e05538f Merge "Text handles do not handle scroll correctly" into ics-mr0 2011-10-28 13:41:01 -07:00
The Android Open Source Project
d211a99952 Reconcile with ics-mr0-release 
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
 2011-10-28 13:05:27 -07:00
Jeff Sharkey
eea1d1a382 Merge "Differentiate between system_server and unknown." into ics-mr1 2011-10-28 12:24:44 -07:00
Daniel Sandler
3be100bcac Merge "Tuning parameters for mobile RSSI." into ics-mr1 2011-10-28 12:21:22 -07:00
Raphael
7118ea707b am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge. 
* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
  Cherry-pick f51125d from master to ics-mr0. do not merge.
 2011-10-28 18:54:36 +00:00
Peter Ng
ff05f3f03d Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1 2011-10-28 10:53:54 -07:00
Adam Powell
c57268ee93 Merge "Add API for deferring fragment start." into ics-mr1 2011-10-28 10:43:33 -07:00
The Android Automerger
655522fef5 merge in ics-mr0-release history after reset to ics-mr0 2011-10-28 09:53:33 -07:00
Scott Main
868f0128cf am b44038fd: docs: platform note typo 
* commit 'b44038fd294382d42070eb60df3bf5132eb4cb29':
  docs: platform note typo
 2011-10-28 16:39:46 +00:00
Andreas Huber
944d04686a Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 2011-10-28 09:13:54 -07:00
Daniel Sandler
3b93f94588 Merge "Fix initial Bluetooth icon state." into ics-mr1 2011-10-28 06:29:51 -07:00
Narayan Kamath
7916e9add9 Merge "Widen permissions on synthesized files." into ics-mr1 2011-10-28 02:15:04 -07:00
Jeff Brown
7175809019 am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0 
* commit '84bee4f8746a19428e0ddfd10df1130324dc39fa':
  Fix copyStringToBuffer row index calculation. Bug: 5515552
 2011-10-28 08:20:20 +00:00
Jeff Brown
a2904e6a57 Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0 2011-10-28 01:18:07 -07:00
Jim Miller
30d35a24dc Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1 2011-10-28 00:22:53 -07:00
Robert Greenwalt
ada031b0c5 am c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0 
* commit 'c43b9b6d97ed6dc40e181843aa79159c504e7004':
  Add SFR DUN configuration.
 2011-10-28 04:06:09 +00:00
Robert Greenwalt
21f0be6b0d Merge "Add SFR DUN configuration." into ics-mr0 2011-10-27 21:04:17 -07:00
Peter Ng
d55af7cc40 Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1 2011-10-27 19:17:19 -07:00
Jake Hamby
6fc5e917ab am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0 
* commit '31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
  Fix bug in enabling/disabling SMS cell broadcast activation.
 2011-10-28 02:14:08 +00:00
Justin Ho
2738256a40 am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0 
* commit '9e7407ed2b18800291612fb9fb355ef062801f07':
  Increase navigation icon brightness by 10%
 2011-10-28 02:14:05 +00:00
Justin Ho
829fc3c335 am e7ff3906: Merge "Increase notification icon brightness" into ics-mr0 
* commit 'e7ff39066c42f66913dbe23f61478273daa30f4d':
  Increase notification icon brightness
 2011-10-28 02:14:04 +00:00
Jamie Gennis
d8f8870244 am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
  Stagefright: ANW::connect in MediaPlayerService
 2011-10-28 02:14:01 +00:00
Robert Greenwalt
57aa48b327 am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0 
* commit '81433a38784e64dbc155047a3915cf5eff32840b':
  Temp disable Tethering if DUN is required
 2011-10-28 02:13:59 +00:00
Justin Ho
f3d05ef9de am 28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0 
* commit '28b3fd136d713b4d94fc72113e1ff42637374d2a':
  Correctly updating Roboto HHEA table
 2011-10-28 02:13:56 +00:00
Dianne Hackborn
f9a31968c6 Merge "New framework performance tests." into ics-mr1 2011-10-27 18:34:04 -07:00
Daniel Sandler
52896a0e3d Merge "Fix race condition in status bar init code." into ics-mr1 2011-10-27 17:54:50 -07:00
Jake Hamby
522d8b7bf8 Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0 2011-10-27 17:46:32 -07:00
The Android Automerger
7c7b114bdd Revert "Clean up CursorWindow code." 
This reverts commit 3bc6bbc92cd2095f42039b5aadd0a14d0e5d9230.
 2011-10-27 17:42:17 -07:00
The Android Automerger
10a6f64fac Revert "Fix regression in CursorWindow.copyStingToBuffer." 
This reverts commit d0ff68da6a606602235fb8749473999e3d1bde53.
 2011-10-27 17:41:26 -07:00
The Android Automerger
1c46edd8c6 Revert "Use ashmem for CursorWindows." 
This reverts commit 0cde89f5f025b7826be009ebb9673b970e180e32.
 2011-10-27 17:39:53 -07:00
Justin Ho
f9dc46c062 Merge "Increase navigation icon brightness by 10%" into ics-mr0 2011-10-27 16:37:02 -07:00
Justin Ho
536b586734 Merge "Increase notification icon brightness" into ics-mr0 2011-10-27 16:36:52 -07:00
Mangesh Ghiware
721f5bc7aa Merge "Fix restore of view and text wrap scales." into ics-mr1 2011-10-27 16:11:32 -07:00
Jamie Gennis
263a3a5825 Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 2011-10-27 16:04:45 -07:00
Robert Greenwalt
982beae457 Merge "Temp disable Tethering if DUN is required" into ics-mr0 2011-10-27 15:43:47 -07:00
Mathias Agopian
86eb34f18e Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1 2011-10-27 15:37:33 -07:00
Justin Ho
a617bf39ca Merge "Correctly updating Roboto HHEA table" into ics-mr0 2011-10-27 15:26:42 -07:00
James Dong
bf9282af5b Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 2011-10-27 15:24:28 -07:00
Bart Sears
6acaef12ce am 777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0 
* commit '777e682f13c8874f60ca21cb9264ae26a9d19a40':
  Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
 2011-10-27 22:21:34 +00:00
Bart Sears
2210ea4e58 Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0 2011-10-27 15:20:12 -07:00
Michael Jurka
eb99f03568 Merge "Fix recents button on large devices (5490265)" into ics-mr1 2011-10-27 14:55:37 -07:00
Eric Fischer
37b6a6afd9 am 60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '60912254972abee324f10f57b0093732aa01adb8':
  Import revised translations.  DO NOT MERGE
 2011-10-27 21:46:42 +00:00
Robert Greenwalt
8906e6c6d6 am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0 
* commit '8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
  Fix Tethering settings.
 2011-10-27 21:46:35 +00:00
Scott Main
91254c988c Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1 2011-10-27 14:43:50 -07:00
RoboErik
e8d45a7002 Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1 2011-10-27 14:41:03 -07:00
Scott Main
a8399c8a13 resolved conflicts for merge of b6cf4b7f to ics-mr1 
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
 2011-10-27 14:40:53 -07:00
James Dong
8d31d261bf Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 2011-10-27 14:09:50 -07:00
Eric Fischer
26ba3343eb Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-27 13:59:51 -07:00
John Reck
ab786ff865 Merge "Keep text handles in sync with native touch targets" into ics-mr1 2011-10-27 13:40:24 -07:00