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

33011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neel Parekh
03bc711c8a Merge "Fix pressed vs selected typo in onCreateDrawableState" 2010-10-06 11:45:55 -07:00
Neel Parekh
e537858ba7 Fix pressed vs selected typo in onCreateDrawableState 
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
 2010-10-06 11:39:53 -07:00
Irfan Sheriff
be93061e2c Merge "Add LinkAddress" 2010-10-06 11:26:44 -07:00
Gil Dobjanschi
ff61e8bea7 Merge "Added VideoEditor reference to protected AudioTrack constructor" 2010-10-06 11:26:24 -07:00
Shimeng (Simon) Wang
e99b0b992a Merge "Add wrapper method for native JNI call." 2010-10-06 11:20:05 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress 
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
 2010-10-06 11:04:05 -07:00
Gil Dobjanschi
0ca0a12c6b Added VideoEditor reference to protected AudioTrack constructor 
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
 2010-10-06 10:53:49 -07:00
Adam Cohen
32e60fbea7 Merge "Fixing AdapterViewAnimator crash when associated adapter is empty" 2010-10-06 10:43:18 -07:00
Adam Cohen
3042944c6e Fixing AdapterViewAnimator crash when associated adapter is empty 
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
 2010-10-06 10:39:11 -07:00
Irfan Sheriff
128cecab96 Add proxy settings per wifi network 
Provide per network proxy settings configuration
for wifi. This is stored along with the ip configuration
in ipconfig.txt

bug: 3039302
Change-Id: Ic8bc14493583be19fde3d7c463d1e5a77e6df25f
 2010-10-06 10:36:36 -07:00
Gil Dobjanschi
f62bedc5c0 Merge "Added the video editor to the media items and audio track constructors." 2010-10-06 10:25:20 -07:00
Fred Quintana
c8b7971cb3 Merge "Make a separate active sync queue for initialization and regular syncs." 2010-10-06 10:03:19 -07:00
Gil Dobjanschi
53f89e1230 Added the video editor to the media items and audio track constructors. 
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
 2010-10-06 09:54:34 -07:00
Gil Dobjanschi
572eab6f17 Merge "Adjust start time and duration for overlays and effects." 2010-10-06 09:46:09 -07:00
Steve Block
e86b8a18df Merge "Make sure that we send the DeviceOrientation error event only once" 2010-10-06 08:30:13 -07:00
Steve Block
8980343b13 Make sure that we send the DeviceOrientation error event only once 
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
 2010-10-06 16:12:06 +01: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
Gil Dobjanschi
e5867ef3f0 Adjust start time and duration for overlays and effects. 
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
 2010-10-05 17:25:23 -07:00
Fred Quintana
918339ab82 Make a separate active sync queue for initialization and regular syncs. 
This entails allowing multiple syncs to happen in parallel, with
different limits for regular and initialization syncs.

Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
 2010-10-05 17:25:19 -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
Shimeng (Simon) Wang
bf01312965 Add wrapper method for native JNI call. 
This is to check whether a given mimeType is supported in Android media
framework.

issue: 2816278
Change-Id: I66d379d039c4e1f4a8528654ece006335fd4463f
 2010-10-05 16:59:05 -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