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

32993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
10649792d6 Add two more options to "recordvideo" utility 
o also removed unused code

Change-Id: I49471b0ac1cf70b5eedcde78a21e7770c312c5d6
 2010-10-06 19:07:40 -07:00
Brian Carlstrom
c9d5b31f84 Fix instance count to be long 
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
 2010-10-05 22:23:41 -07:00
Brian Carlstrom
c21550a8d1 Adding android.os.Debug.countInstancesOfClass 
- Debug.countInstancesOfClass is just a wrapper on
  dalvik.system.VMDebug.countInstancesOfClass to avoid code from
  depending on the dalvik classes directly

- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
  and ViewDebug are converted to the new Debug.countInstancesOfClass

- Existing use of OpenSSLSocketImpl.instanceCount, which is being
  removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)

Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
 2010-10-05 21:38:57 -07:00
Robert Greenwalt
759bece170 Merge "Turn on some debugging info" 2010-10-05 19:14:45 -07:00
Robert Greenwalt
ba175a5e13 Turn on some debugging info 
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
 2010-10-05 19:12:26 -07:00
James Dong
b74ccaad18 Merge "Use setVideoSize API in StagefrightRecorder" 2010-10-05 19:01:10 -07:00
Romain Guy
1e14f49d06 Merge "Optimize saveLayer() when the clip flag is set." 2010-10-05 18:16:35 -07:00
Romain Guy
eb99356a05 Optimize saveLayer() when the clip flag is set. 
This speeds up applications, especially Launcher.
 2010-10-05 18:14:38 -07:00
Dianne Hackborn
0f8ee7439a Merge "Implement permission granting in clipboard." 2010-10-05 17:54:35 -07:00
Vasu Nori
ecba4f3373 Merge "fix broken build" 2010-10-05 17:46:36 -07:00
Vasu Nori
c2ce721fcf fix broken build 
Change-Id: Ic00e8b98780d48928e05ee27f855e8211fb1ec47
 2010-10-05 17:45:37 -07:00
Vasu Nori
b8e109aa9e Merge "annotate some tests large - just in case they take longer. bug:3066136" 2010-10-05 17:08:53 -07:00
Kenny Root
4f65ea6055 am bfa33b94: am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread 
Merge commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b'

* commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b':
  Use pread() in ZipFileRO for Linux
 2010-10-05 17:02:42 -07:00
Gilles Debunne
0f935ebfff am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset. 
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'

* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
  Restored ic_dialog_menu_generic asset.
 2010-10-05 17:02:27 -07:00
Vasu Nori
790762ca8f annotate some tests large - just in case they take longer. bug:3066136 
Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
 2010-10-05 16:53:57 -07:00
Vasu Nori
572ce01e9e Merge "turn off some useless messages" 2010-10-05 16:53:24 -07:00
Vasu Nori
b7e2c783af turn off some useless messages 
Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
 2010-10-05 16:50:51 -07:00
Gilles Debunne
d688b0cc40 am 8556efe5: (-s ours) am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread 
Merge commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920'

* commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
  DO NOT MERGE. Select word no longer selects spaces between words.
 2010-10-05 16:16:20 -07:00
Scott Main
996acec5bd am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement 
Merge commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f'

* commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f':
  docs: update homepage with more countries for market announcement
 2010-10-05 16:15:44 -07:00
Alex Sakhartchouk
eccce09f1e Merge "Adding average fps counter. Removing rsLight from libRS" 2010-10-05 15:32:38 -07:00
Chet Haase
2e292e9da4 Merge "Adding next/prev to fragment animations and to PreferenceActivity" 2010-10-05 15:21:34 -07:00
Scott Main
5302798581 Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced." 2010-10-05 15:19:27 -07:00
Scott Main
537b222514 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'

* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-05 15:17:40 -07:00
James Dong
73fe79da09 am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread 
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
  Resilent media time stamp adjustment
 2010-10-05 15:17:29 -07:00
Gilles Debunne
a4a01b5d6b am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
 2010-10-05 15:17:17 -07:00
Adam Powell
195e9d8adb am dcbf315e: am 368733b2: Remove overscroll_edge.png from drawable/ 
Merge commit 'dcbf315e83234623622bd268a823ecc4dc49e375'

* commit 'dcbf315e83234623622bd268a823ecc4dc49e375':
  Remove overscroll_edge.png from drawable/
 2010-10-05 15:17:05 -07:00
Adam Powell
59124abf2d am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 
Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'

* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
  Fix bug 3052686 - ScrollView padding treated incorrectly
 2010-10-05 15:16:48 -07:00
Chet Haase
9ff82bf2b3 Adding next/prev to fragment animations and to PreferenceActivity 
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).

Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
 2010-10-05 15:13:24 -07:00
Scott Main
f6fe78b2ae docs: Rewrite of App Fundamentals.. Part 1. 
This introduces two new docs:
Activities
  Provides a fundamental introduction to how activities work, including
  the basics about layout, manifest entries, starting activies, getting results,
  and the complete discussion about the lifecycle (which used to be in the
  fundamentals.jd document under "Component Lifecycles"), but also now includes more
  information about saving instance state (with new diagrams).
Tasks and Back Stack
  A large expansion of the material originally presented in the fundamentals.jd
  document under "Activities and Tasks". This doc talks all about how tasks and
  the back stack work. This content re-organization is important because fragments
  can now become a part of the back stack (which is a task-oriented concept), thus,
  it's important to separate the task ideas from being tied directly to activities only,
  which is how tasks are currently discussed. However, fragments are not yet discussed
  here in detail---that will come later when the fragment dev guide is introduced.

Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
 2010-10-05 15:06:33 -07:00
Romain Guy
10bc365225 Merge "Add support for paletted textures." 2010-10-05 15:00:01 -07:00
Romain Guy
7adaf3d1aa Add support for paletted textures. 
Change-Id: I36e6069bd58f78c609cdd1f3e4560c98f128f48e
 2010-10-05 14:58:09 -07:00
Dianne Hackborn
90f4aafa33 Implement permission granting in clipboard. 
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
 2010-10-05 14:09:08 -07:00
Romain Guy
e21635571e Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Christopher Tate
643bfdaf45 Merge "Make View.DragThumbnailBuilder a static class" 2010-10-05 13:43:44 -07:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now. 
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
 2010-10-05 13:42:35 -07:00
Jason Sams
68159aabb3 Merge "Implement allocation resizing." 2010-10-05 13:35:47 -07:00
Jason Sams
5edc608a07 Implement allocation resizing. 
Change-Id: Ie38d42419d595cec730a8721cc1321c5edb6b4d6
 2010-10-05 13:32:49 -07:00
Alex Sakhartchouk
76322af2a6 Adding average fps counter. 
Removing rsLight from libRS

Change-Id: I8622efd10619dc120d37f3a12122e9c7fc34ff2e
 2010-10-05 13:28:09 -07:00
Christopher Tate
a0374192b9 Make View.DragThumbnailBuilder a static class 
It also now uses a WeakReference to the associated View, not a hard
object pointer.

Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
 2010-10-05 13:14:25 -07:00
Alex Sakhartchouk
cd1b8d3665 Merge "Adding text metrics to renderscript." 2010-10-05 13:13:40 -07:00
Dianne Hackborn
38014763a2 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-05 12:54:41 -07:00
Vasu Nori
54f9ac5880 Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db" 2010-10-05 12:27:27 -07:00
Gilles Debunne
3d535d2949 Merge "resolved conflicts for merge of 8390651c to master" 2010-10-05 12:26:22 -07:00
Gilles Debunne
ff3c191d2a resolved conflicts for merge of 8390651c to master 
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
 2010-10-05 12:11:56 -07:00
Alex Sakhartchouk
10825a07ae Adding text metrics to renderscript. 
Change-Id: Ica460525243d714a278e4ad5e436af43e1008e0c
 2010-10-05 11:33:27 -07:00
Ficus Kirkpatrick
f6904c4bb4 Merge "Reduce log spam." 2010-10-05 11:33:03 -07:00
Ficus Kirkpatrick
6fd771b346 Reduce log spam. 
Remove the WifiService ACTION_BATTERY_CHANGED log message.

Change-Id: Idfcdf1661f9243a9eb043419490a7138533f3357
 2010-10-05 11:28:23 -07:00
Adam Cohen
ef52176f12 Changing AdapterViewAnimator to use the new animation APIs 
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
 2010-10-05 11:02:25 -07:00
Vasu Nori
6d970255af STOPSHIP - add illegalStateException to catch potential deadlocks in db 
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner

Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
 2010-10-05 10:50:45 -07:00
Joe Onorato
066b5c5166 manual merge Merge commit '77e42376' into work 
Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
 2010-10-05 12:37:03 -04:00