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

74643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mangesh Ghiware
518e83b8c6 On double-tap, simply zoom in if content is too wide. 
Bug: 6257654
Change-Id: I6963476300619d6f0d6af46630f9a86d95ad0dfc
 2012-04-10 17:42:49 -07:00
Chris Craik
00ed0fd27f Unify composited layer/base layer draw path 
Multiple paths were redundant, as they both synchronized the layers, and drew
the base if needed.

Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/179965/

Change-Id: I1c355510f6edda4631190f2d26df8171e795a6ac
 2012-04-10 17:29:35 -07:00
Dan Morrill
4527a92421 Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole." 2012-04-10 17:13:17 -07:00
Robert Ly
21c9ae0458 docs: fix bug 5158332 
Change-Id: I4ced8e7808727a6789732d10601fe6aa4985d8ba
 2012-04-10 16:05:23 -07:00
Eino-Ville Talvala
9184ec307b Editing fixes to ImageFormat documentation. 
Change-Id: I74738a65abc3abbb49825b16f4efe3ac2eb6d28e
 2012-04-10 15:57:31 -07:00
Dianne Hackborn
9944ecd28e Hide the callback for activity animation options. 
Not something I want to be stuck reporting forever.

Change-Id: Iab13fb7abb23d466492230242bfbae29f1fd01f3
 2012-04-10 15:54:19 -07:00
John Grossman
5f48909604 Merge "TimedAudio: Track of the number of pending frames." into ics-aah 2012-04-10 15:43:17 -07:00
Dianne Hackborn
2a854c13f8 Merge "Some small tweaks to improve memory management." 2012-04-10 15:25:43 -07:00
Robert Ly
4245ab34d1 am 82321d1f: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '82321d1fbfdd544225ca063a1d43a3a9c53ea5df':
 2012-04-10 15:13:41 -07:00
Amith Yamasani
f882f1ad4e Bind to the correct face lock service. 
When switching users, bind to the correct instance of FaceLock.

Tried to get the facelock screen to show up when switching users, but it
doesn't. Power off/on works, but not switching between users on the
lockscreen. Maybe a timing issue? Or not calling some function to make
the overlay visible?

Change-Id: I9300971331c7f0ed93ae7da28170342629426b20
 2012-04-10 15:13:39 -07:00
Robert Ly
9ec0746bbb am 2ce5444d: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '2ce5444d638e9504521e155ffdbb363f88cdc534':
 2012-04-10 15:13:39 -07:00
Robert Ly
5f9b286f5b am c4bbc7b4: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit 'c4bbc7b4e44c2292d1fdfc7fa4cfac6a55fc3da9':
 2012-04-10 15:13:37 -07:00
Android Git Automerger
3b5966b069 am d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'd1ba68955947c208831711efdf2d6c4e5fb86d84':
 2012-04-10 15:09:20 -07:00
Robert Ly
97dbfc7ae3 am bc8eaa7d: am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit 'bc8eaa7d63865ee2532014419a0e384c62c7027e':
 2012-04-10 15:09:13 -07:00
Robert Ly
5df9ad98b6 am 030c8614: am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '030c86145a011dc20012f2a63aa0da6e365c50b2':
 2012-04-10 15:09:11 -07:00
Robert Ly
55fc26c250 am 21b2ec79: am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '21b2ec7980b405f5c808a265c04cc1b3f1ae23de':
 2012-04-10 15:09:09 -07:00
Android Git Automerger
d1ba689559 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-10 15:01:06 -07:00
Dianne Hackborn
162bc0ea0d Some small tweaks to improve memory management. 
We now allow processes that currently have stopping activities to
be managed as if they were done stopping, so that memory trimming
can be done before the process goes to the background.  Hopefully
this will reduce cases where the processes goes to the background
and immediately gets killed, but wouldn't have had to be killed if
it had a chance to trim its memory.

Also change window memory trimming to always do the aggressive
trimming when memory is critical, even if not on a low-end device.

And tweak web view trimming to not trim for foreground UI events.

Change-Id: I241b3152b52d09757bd14a202477cf69c9b78786
 2012-04-10 14:43:58 -07:00
Robert Ly
a8ed2880a8 am d87121f4: am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit 'd87121f46efd48f63f3cd181c8ff081f11ff0feb':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:34:04 -07:00
Robert Ly
b18530c45d am 07ced01f: am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '07ced01f0420ec0d70b1dd38e41e9b3b121fffb0':
  docs: fixing ndk bug 5991108
 2012-04-10 14:34:03 -07:00
Robert Ly
d7e4e482df am 12d80df0: am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '12d80df0b276b5d7e3e56388c02108a3a1f864cb':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:34:00 -07:00
Craig Mautner
f0cabba38b Merge "Fix NPE in setTransparentRegion." 2012-04-10 14:33:07 -07:00
Robert Ly
bc8eaa7d63 am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '11d33b3da5fa8c46be17135deecdded9f11b61a0':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:30:34 -07:00
Robert Ly
030c86145a am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit 'b3f7fc2f7769defa8c7de9254f0cba163a2ea63e':
  docs: fixing ndk bug 5991108
 2012-04-10 14:30:32 -07:00
Robert Ly
21b2ec7980 am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '9fd8aaca4762f0852c016af34db696eebd4bfc92':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:30:30 -07:00
Jeff Brown
cd2a3ea5c8 Merge "Don't reuse StringBuilder outside of lock when dumping ANR." 2012-04-10 14:30:20 -07:00
Robert Ly
d87121f46e am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit 'c71a1bb9d455b547cba73947d13a50933c1cb1be':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:30:15 -07:00
Robert Ly
07ced01f04 am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
  docs: fixing ndk bug 5991108
 2012-04-10 14:30:13 -07:00
Robert Ly
12d80df0b2 am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '86b6e26c78bf5d491a2cf2aa06e3812be326d722':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:30:11 -07:00
Robert Ly
c71a1bb9d4 am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:26:28 -07:00
Robert Ly
82321d1fbf am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:26:27 -07:00
Jeff Brown
deb6ed8c2e Don't reuse StringBuilder outside of lock when dumping ANR. 
The ANR dumping code was reusing the shared StringBuilder while
not holding the ActivityManagerService lock.  As a result, other
threads could sweep in and clobber the ANR information.
We don't want to hold the lock here, so just create a new StringBuilder.

Change-Id: I0d91af55f5c123102cfab2cd97035491efed59c0
 2012-04-10 14:26:26 -07:00
Robert Ly
9585dcc48a am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
 2012-04-10 14:26:26 -07:00
Robert Ly
2ce5444d63 am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
 2012-04-10 14:26:25 -07:00
Robert Ly
c4bbc7b4e4 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:26:23 -07:00
Robert Ly
86b6e26c78 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:26:19 -07:00
Robert Ly
11d33b3da5 am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:26:10 -07:00
Robert Ly
b3f7fc2f77 am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
 2012-04-10 14:26:08 -07:00
Robert Ly
9fd8aaca47 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:26:07 -07:00
Craig Mautner
1f4e0ccba0 Fix NPE in setTransparentRegion. 
Check for null Surface before using it.

Fixes bug 6312835.

Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7
 2012-04-10 14:24:38 -07:00
Robert Ly
23f08c6d64 Merge "docs: fixing broken link for bug 6104366" into ics-mr1 2012-04-10 14:24:00 -07:00
Robert Ly
2e9dac4b05 Merge "docs: fixing ndk bug 5991108" into ics-mr1 2012-04-10 14:23:50 -07:00
Robert Ly
876b7b876e Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 2012-04-10 14:23:37 -07:00
Craig Mautner
592647ee2e Merge "Fix IndexOutOfBoundsException." 2012-04-10 14:23:10 -07:00
George Mount
1bee28f4c8 Merge "Revert "Revert "Keep selection handles in edit fields.""" 2012-04-10 14:23:07 -07:00
Eric Fischer
cd1c059bbc Merge "Import translations. DO NOT MERGE" 2012-04-10 14:22:52 -07:00
Jack Palevich
2b39c3126b Merge "Notify monitor waiters when changing mSurfaceIsBad value." 2012-04-10 14:20:28 -07:00
Jeff Sharkey
cc0ec91307 Merge "Move to Android-specific NTP pool." 2012-04-10 14:01:53 -07:00
Jeff Sharkey
40caf8f443 Move to Android-specific NTP pool. 
Use "2.android.pool.ntp.org" since it returns both IPv4 and IPv6
addresses.  Verified that NTP client works correctly on both.

Change-Id: I0187ef4a6d3b353cfcc77957b1303ca01c67cbe9
 2012-04-10 13:48:10 -07:00
George Mount
7102eb2d30 Revert "Revert "Keep selection handles in edit fields."" 
This reverts commit 90c08eafad72454a31282fd887ec23d357c904a4
 2012-04-10 13:41:51 -07:00