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

73466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
cde6adf45c Fix the build 
Change-Id: I6de62c7bfaecd85810178f58707157466291eca3
 2012-03-15 17:04:47 -07:00
Jeff Brown
16f5f5cc9d Delete useless JNI methods. 
Change-Id: Ie7c7638c79fc9c6a43f45604ad9a40ebc58b93c7
 2012-03-15 16:58:22 -07:00
George Mount
c6c549d8d2 Update edit text size when the text changes so scroll works. 
Bug 6176413
 Webkit Change: I487322ca9578c003f937b92ca4e8d46d34ea8c78

Change-Id: I6b8f244cd747d6d19c261d685a3cfb9ef4d71ec3
 2012-03-15 16:43:14 -07:00
Gilles Debunne
590924e10a Merge "Multiple display lists for editable text" 2012-03-15 16:35:56 -07:00
Jeff Sharkey
e5d4933692 Better exceptions around provider permissions. 
When enforcing ContentProvider permissions, mention which
<path-permission> caused the denial.

Bug: 6131916
Change-Id: I06ed461d188fc92c7ddc2acc92ec6169a7c9891a
 2012-03-15 16:34:24 -07:00
Xavier Ducrohet
19e27c051d Merge "Fix sdk layout rendering in JB." 2012-03-15 16:24:37 -07:00
Xavier Ducrohet
a421f6c0ba Fix sdk layout rendering in JB. 
Since JB, com.android.internal.R does not contain all the resources,
instead only the ones that are accessed through Java.
This means we need to dynamically generate IDs for resources that are
private and only accessed from other XML resources. This is done
through the DynamicIdMap class.

Also add a PolicyManager and a PowerManager since those are now
needed by ViewRootImpl?!?

Change-Id: If2ae8ad79502fa084d852664a44aefd46e01aec6
 2012-03-15 16:23:51 -07:00
Romain Guy
c6e8811cb4 Merge "Postpone DisplayList recycling when detached from window" 2012-03-15 16:20:25 -07:00
Jeff Brown
c0102b7a7d Merge "Port the SQLite locale setting code to Java." 2012-03-15 16:07:08 -07:00
Scott Main
bb236c89b1 am 66c36b88: am 886603da: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '66c36b886dfe036784ee554ddfb0a31e4caca8bc':
 2012-03-15 16:05:13 -07:00
Jeff Brown
1d9f742e00 Port the SQLite locale setting code to Java. 
Make the database opening code more robust in the case of
read-only database connections.

Check whether a PRAGMA needs to be issues before doing it.
Mostly it's harmless but it can grab a transaction on the
database unnecessarily.

Change-Id: Iab2cdc96c785e767f82966b00597e19337163f2f
 2012-03-15 16:02:58 -07:00
Glenn Kasten
42c6d163aa Merge "Add empty libmedia_native in old location" 2012-03-15 16:02:46 -07:00
Scott Main
d45f5b5843 am af2827ba: am 714d655c: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'af2827ba96361a63eac792e679027f8d6f2c8482':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 16:02:29 -07:00
Scott Main
66c36b886d am 886603da: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '886603da73526eb992dfb4bc5afc89c7a17294d8':
 2012-03-15 16:00:40 -07:00
Scott Main
af2827ba96 am 714d655c: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '714d655ccfcc0d465a1a8c190d407e3d97261d76':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:59:37 -07:00
Scott Main
9d9a08c07b am 04144b4b: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '04144b4b38bdab608d663fe7419a7c293bf36081':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:59:19 -07:00
Scott Main
714d655ccf am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:56:12 -07:00
Romain Guy
bc7616eae9 Postpone DisplayList recycling when detached from window 
This was causing a crash in apps that remove views during a draw pass.

Change-Id: I1c4621639fe920291b2c6fb7bfd17a69101a1329
 2012-03-15 15:56:11 -07:00
Scott Main
886603da73 am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:56:05 -07:00
Scott Main
04144b4b38 am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:56:03 -07:00
Scott Main
eb1d42e4fa Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 2012-03-15 15:52:56 -07:00
Dianne Hackborn
fe4afa1535 Merge "Fix swiping away recents to always kill processes." 2012-03-15 15:50:43 -07:00
Dianne Hackborn
2a29b3ad13 Debugging code for #6169553: Make Phone launch faster 
The activity manager now has a tick when launching an app every
500ms, where it collects the current stack traces of the app if
it hasn't finished launching.  These traces are included as part
of dumpstate.

This is only done on non-user builds.

Change-Id: I7f09ea00aab821ac81795f48c9d68fcca65f89fe
 2012-03-15 15:48:38 -07:00
Glenn Kasten
e6aa25bb8e Add empty libmedia_native in old location 
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects.  Then those projects will not
need to be updated atomically when libmedia_native is moved.

Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
 2012-03-15 15:32:20 -07:00
Romain Guy
0e7b094a61 Merge "Set the default text length to -1, not 1" 2012-03-15 14:59:26 -07:00
Craig Mautner
b2aa1b048d Merge "Separate layout ops from surface ops." 2012-03-15 14:57:15 -07:00
Selim Gurun
1cedb47e18 Merge "Make the credential storage change action public." 2012-03-15 14:55:15 -07:00
Romain Guy
acdd4b9c4b Set the default text length to -1, not 1 
Change-Id: Iccf6f8366c0b659ba7c90df99ae05ebc5d81fcbb
 2012-03-15 14:36:52 -07:00
Eric Fischer
80a54c5005 am 3fc7a20e: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-aah 
* commit '3fc7a20efcde6d2936f6f6efeba6661a38144f9c':
  Import translations. DO NOT MERGE
 2012-03-15 13:49:07 -07:00
Eric Fischer
a1d2bd829d Merge "Import translations. DO NOT MERGE" 2012-03-15 13:48:06 -07:00
Eric Fischer
dfc4ce3c4e Merge "Import translations. DO NOT MERGE" into ics-aah-exp 2012-03-15 13:47:36 -07:00
Eric Fischer
3fc7a20efc Merge "Import translations. DO NOT MERGE" into ics-aah 2012-03-15 13:47:27 -07:00
Dianne Hackborn
9da2d40334 Fix swiping away recents to always kill processes. 
This would only kill processes if there were activities associated
with the recent task; now it always kills processes.

Always fix some debug output.

Change-Id: Iccda19ba0a20823347b06c13b450587283d28284
 2012-03-15 13:43:08 -07:00
Eric Fischer
1469438f8b Import translations. DO NOT MERGE 
Change-Id: Icb1104d90c24d1f6a572205e2a6bcb9fcd489b19
 2012-03-15 13:37:49 -07:00
Eric Fischer
713eb6b4c8 Import translations. DO NOT MERGE 
Change-Id: I2995069e595d94cb90738e57e29de7d49b193846
 2012-03-15 13:28:31 -07:00
Eric Fischer
ee99a333c8 Import translations. DO NOT MERGE 
Change-Id: Ibf2f1c11aeb2a67003a8912d921d05bc761c1e6a
 2012-03-15 13:26:36 -07:00
Romain Guy
8e06f3e7ab Merge "Cleanup ListView glow's optimized invalidates" 2012-03-15 13:15:46 -07:00
Glenn Kasten
94a36440ba audio_channel_in/out_mask_from_count 
and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count

Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
 2012-03-15 13:15:27 -07:00
Romain Guy
a8bfeaf4f4 Cleanup ListView glow's optimized invalidates 
Change-Id: Ie9759fd95366866512ec55072aa482f972650d15
 2012-03-15 13:14:14 -07:00
Kenny Root
5461f5e8b9 Merge "Add support for EINTR in BT" 2012-03-15 13:09:28 -07:00
Amith Yamasani
0791335443 Merge "Fix sync tests failure." 2012-03-15 12:38:40 -07:00
Jack Palevich
48a59c3d85 Ignore EGL_BAD_CURRENT_SURFACE errors from eglSwapBuffers 
Certain EGL device drivers are generating this error, so we need to
survive it. (It's not clear from the EGL spec whether this is a
legitimate error code, but since it's being generated we need to
handle it.)

Remove logging of expected errors from elSwapBuffers. We expect these
errors to happen, and are handeling them by ignoring them.
No need to clutter the logs.

Bug: 6083241

Change-Id: If17dcfbb68d3009b92cf95a448728ccb47023b51
 2012-03-15 11:50:45 -07:00
Dianne Hackborn
6959a43fbc am f0cbb03a: am 42ef93fc: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit 'f0cbb03ad251e6d69d8a41df3b57c6b33e0e5325':
 2012-03-15 11:39:22 -07:00
Dianne Hackborn
df358687f5 am b99b7f51: am 4d85c98d: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit 'b99b7f51b0b9406fb36189092e8d560c164718fc':
  Remove fade animations from framework drawables.
 2012-03-15 11:39:19 -07:00
Android Git Automerger
83ccdc4e37 am bf324a1c: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'bf324a1c2809403f2dc18afffd8f1202a99e2ba8':
 2012-03-15 11:39:17 -07:00
Scott Main
49495f858a am 8fc949eb: am 1fbc85d3: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit '8fc949ebb1963fa053f7b2b1436989f479c20348':
 2012-03-15 11:39:14 -07:00
Scott Main
5d85819ced am 40b4f04a: am 15010776: am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit '40b4f04ac3f8dd11fc1313472aca3713b34d7f6a':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
 2012-03-15 11:39:11 -07:00
Android Git Automerger
b6d57d5393 am f197d6a8: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'f197d6a8d2f59a1f7b7e6d84c812bb1706e2fbf9':
 2012-03-15 11:39:03 -07:00
Robert Ly
79fa149f68 am 75bb4594: am af3701f4: am 957f716c: docs: fix toc in search au class 
* commit '75bb45945249be1d2ab3614429d76ffb082cc7c4':
 2012-03-15 11:39:01 -07:00
Robert Ly
fd4ef3f6f0 am c600323c: am da04da21: am 957f716c: docs: fix toc in search au class 
* commit 'c600323c592e7985022766fca7706ae6a76db921':
  docs: fix toc in search au class
 2012-03-15 11:38:58 -07:00