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

60686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
258f52fed3 am 859bf0f2: am 81433a38: Merge "Temp disable Tethering if DUN is required" into ics-mr0 
* commit '859bf0f2efb7b5518055893c17aa3a6437023633':
  Temp disable Tethering if DUN is required
 2011-10-28 02:53:18 +00:00
Justin Ho
b7811355cf am 1b15f7f1: (-s ours) am 28b3fd13: Merge "Correctly updating Roboto HHEA table" into ics-mr0 
* commit '1b15f7f1abc73683fe067e4b0b00e2e5c70a6282':
  Correctly updating Roboto HHEA table
 2011-10-28 02:53:17 +00:00
Robert Greenwalt
859bf0f2ef 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
1b15f7f1ab 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
d2401cfb2b am ea1db611: Fix build. Forgot to add files. :( 
* commit 'ea1db611b493d70e82641f8dc01d4a4c4ffcd3e7':
  Fix build.  Forgot to add files. :(
 2011-10-28 02:08:18 +00:00
Dianne Hackborn
ea1db611b4 Fix build. Forgot to add files. :( 
Change-Id: I89dcc247d957a4873c56017bc262dd717d236258
 2011-10-27 19:03:14 -07:00
Dianne Hackborn
d323069ab0 am 114ac293: Merge "New framework performance tests." into ics-mr1 
* commit '114ac293b8df1e1db817603bcb77507451e87cd4':
  New framework performance tests.
 2011-10-28 01:37:40 +00:00
Dianne Hackborn
114ac293b8 Merge "New framework performance tests." into ics-mr1 2011-10-27 18:34:04 -07:00
Daniel Sandler
15fade2ebd am d939dd2e: Merge "Fix race condition in status bar init code." into ics-mr1 
* commit 'd939dd2eaacbe898dc82170a4b41a7248fe182e6':
  Fix race condition in status bar init code.
 2011-10-28 00:59:12 +00:00
Daniel Sandler
d939dd2eaa Merge "Fix race condition in status bar init code." into ics-mr1 2011-10-27 17:54:50 -07:00
Mangesh Ghiware
e87d2da0b4 am ade26e2e: Merge "Fix restore of view and text wrap scales." into ics-mr1 
* commit 'ade26e2e383cd0041f8aa94467d119c2bd1ee5e8':
  Fix restore of view and text wrap scales.
 2011-10-27 23:15:58 +00:00
Mangesh Ghiware
ade26e2e38 Merge "Fix restore of view and text wrap scales." into ics-mr1 2011-10-27 16:11:32 -07:00
Dianne Hackborn
d4c4b76889 New framework performance tests. 
Change-Id: Ib8cc6704f508b7516ba0a30aa71bb88ef028691d
 2011-10-27 16:03:14 -07:00
Robert Greenwalt
81433a3878 Merge "Temp disable Tethering if DUN is required" into ics-mr0 2011-10-27 15:43:47 -07:00
Mathias Agopian
5f7a00551d am 7165b92e: Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1 
* commit '7165b92e71bc6a1a741a53dc7968af88e7958f39':
  fix Corrupted graphics while playing You Tube on orientation change
 2011-10-27 22:41:29 +00:00
Mathias Agopian
7165b92e71 Merge "fix Corrupted graphics while playing You Tube on orientation change" into ics-mr1 2011-10-27 15:37:33 -07:00
James Dong
21122cb44e am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 
* commit 'da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
  Report call status from AudioSource::start() to file writer
 2011-10-27 22:28:08 +00:00
Justin Ho
28b3fd136d Merge "Correctly updating Roboto HHEA table" into ics-mr0 2011-10-27 15:26:42 -07:00
Bart Sears
7cb556f5a9 am 88fbb19a: am 777e682f: Merge "Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list" into ics-mr0 
* commit '88fbb19a55d17803bbf474c80707730b8de200e4':
  Add Lohit-Tamil.ttf and Lohit-Bengali.ttf to Fallback list
 2011-10-27 22:25:47 +00:00
James Dong
da57c0e8cf Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 2011-10-27 15:24:28 -07:00
Bart Sears
88fbb19a55 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
Mangesh Ghiware
f0e96d54b6 Fix restore of view and text wrap scales. 
Fixes bug 5507881: Open pages in overview doesn't stick on initial
browser load.

Update the fix for bug 5230909: Zoom not restored on Back.

Added a boolean to indicate that scales have been restored. In the case
of restored scales (view and text wrap) being zero, set them to overview
and reading level respectively.

Change-Id: I5a22dd2040a22ee3b48c5903b586a65a4fa320f2
 2011-10-27 15:20:49 -07:00
Bart Sears
777e682f13 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
208e1a159d am c4f09e03: Merge "Fix recents button on large devices (5490265)" into ics-mr1 
* commit 'c4f09e03099cddc57aa5b777921182ab1d13ae8a':
  Fix recents button on large devices (5490265)
 2011-10-27 21:59:30 +00:00
Michael Jurka
c4f09e0309 Merge "Fix recents button on large devices (5490265)" into ics-mr1 2011-10-27 14:55:37 -07:00
Eric Fischer
d178500357 am d01b6451: (-s ours) am 60912254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'd01b6451c6caaf33b827a3eeee10b0f54dd93650':
  Import revised translations.  DO NOT MERGE
 2011-10-27 21:54:11 +00:00
Robert Greenwalt
7962d2f129 am 52201ae5: am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0 
* commit '52201ae5421b1efed2568109f3fc37462fdb7c35':
  Fix Tethering settings.
 2011-10-27 21:54:09 +00:00
Justin Ho
b5cc0e1d3d Correctly updating Roboto HHEA table 
Bug: 5516773

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

Change-Id: I1f42c2ef9d57e840804d431183a07b0ed8640ea4
 2011-10-27 14:53:20 -07:00
Svetoslav Ganov
ec6c89b616 Merge "Minor documentation fixes for the APIs to expose virtual view tree." 2011-10-27 14:52:51 -07:00
Robert Greenwalt
4efe58d8e7 Temp disable Tethering if DUN is required 
Getting source-based routing working is too risk for this point
in the project but tethering is broken otherwise, so disable
the tethering option if DUN is required until we can get a real
fix in.

bug:5495862
Change-Id: I5e852bf30c887599024a8b61af86ffec1d5333af
 2011-10-27 14:50:27 -07:00
Scott Main
f9eba6bfb9 am b4e50fe0: Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1 
* commit 'b4e50fe03c269e0c6b60db1702993ac0649bb5a2':
  docs: quick update for fragments guide to consider handsets and new figure (bigger update coming later)
 2011-10-27 21:47:51 +00:00
Eric Fischer
d01b6451c6 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
52201ae542 am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0 
* commit '8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
  Fix Tethering settings.
 2011-10-27 21:46:35 +00:00
RoboErik
28e9733e35 am 8805dc13: Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1 
* commit '8805dc137ad2c254f25117a5eb1fd662a4ef63b0':
  b/5309787 Add new columns to hidden list of read only fields
 2011-10-27 21:45:44 +00:00
Scott Main
b4e50fe03c Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1 2011-10-27 14:43:50 -07:00
RoboErik
8805dc137a 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
e815a58557 resolved conflicts for merge of b6cf4b7f to ics-mr1 
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
 2011-10-27 14:40:53 -07:00
James Dong
b4a9fd9faf am 17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 
* commit '17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
  Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
 2011-10-27 21:13:54 +00:00
RoboErik
c7ef9390cf b/5309787 Add new columns to hidden list of read only fields 
Change-Id: I9bfc01e4211087be0dfd144c022903c51817c024
 2011-10-27 14:11:44 -07:00
James Dong
17a5fb36f8 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
Mark Brophy
437049b76e Merge "Fix scroll listeners lost in ViewTreeObserver." 2011-10-27 14:08:31 -07:00
Gilles Debunne
e9c98bdf99 Merge "Potential thread concurrency issue with WordIterators." 2011-10-27 14:04:03 -07:00
Eric Fischer
6091225497 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-27 13:59:51 -07:00
John Reck
0cce87ef07 am 44c99092: Merge "Keep text handles in sync with native touch targets" into ics-mr1 
* commit '44c990927c362b26b51c4388f8c51e8c799f9932':
  Keep text handles in sync with native touch targets
 2011-10-27 20:43:40 +00:00
John Reck
44c990927c Merge "Keep text handles in sync with native touch targets" into ics-mr1 2011-10-27 13:40:24 -07:00
Daniel Sandler
0dd6b86948 am 9760cd14: Merge "Restore bluetooth icons on tablets." into ics-mr1 
* commit '9760cd1463f06f12c1049fb7ee26796d01cbab99':
  Restore bluetooth icons on tablets.
 2011-10-27 20:21:15 +00:00
Robert Greenwalt
8d059ac5b1 Merge "Fix Tethering settings." into ics-mr0 2011-10-27 13:20:15 -07:00
RoboErik
6520174f4c am 20345af2: Merge "Add new Calendar APIs to fw" into ics-mr1 
* commit '20345af24a50798965f6d295fbe4cc8f78c95e7f':
  Add new Calendar APIs to fw
 2011-10-27 20:19:06 +00:00
Daniel Sandler
9760cd1463 Merge "Restore bluetooth icons on tablets." into ics-mr1 2011-10-27 13:16:43 -07:00
RoboErik
20345af24a Merge "Add new Calendar APIs to fw" into ics-mr1 2011-10-27 13:13:36 -07:00