69862 Commits

Author SHA1 Message Date
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
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
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
a1d2bd829d Merge "Import translations. DO NOT MERGE" 2012-03-15 13:48:06 -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
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
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
Robert Ly
20d7277065 am 9c0ce08e: am 363d178f: am b285125d: Merge "docs: android u search class" into ics-mr1
* commit '9c0ce08e6e317503e175726cb4fe376708afc2e7':
2012-03-15 11:38:52 -07:00
Robert Ly
696c55d40d am d01ec4c9: am c3b24faa: am b285125d: Merge "docs: android u search class" into ics-mr1
* commit 'd01ec4c9afac7984211ec359cf666739df4342a2':
  docs: android u search class
2012-03-15 11:38:49 -07:00
Craig Mautner
bf90eaa5d2 Separate layout ops from surface ops.
Further work to isolate layout from animation and surface operations.
Remove cruft and minor refactoring.

Change-Id: I6f910ed72c7c614996641c353870c2b2ab5e8bb4
2012-03-15 11:34:24 -07:00
Dianne Hackborn
f0cbb03ad2 am 42ef93fc: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '42ef93fcc455b9194a7603fed439e8d4490d634f':
2012-03-15 11:33:34 -07:00
Gilles Debunne
33b7de85b6 Multiple display lists for editable text
Bug 5763685

Long text in a ScrollView (not when the View's internal
scroll is used) is cached as a unique display list when hardware
rendering is on.

As a result, each time the text is edited, the entire display
list has to be updated, which takes a significant amount of
time (up to 500ms for a few thousand lines), proportional to the
size of the text.

This CL splits the text into multiple display lists as the
text is edited. The boundaries of the display list are aligned
with paragraphs.

There is still an issue when the number of lines changes: onLayout()
is called which invalidates all the display list. When the source
of that change is line wrapping and not a change in the view's
dimensions, we should be able to simply shift down the previous DL
instead of re-creating everything.

Change-Id: I7de49a1e5637cdfc9ef06b64b1ec4b61d9ea2415
2012-03-15 11:32:50 -07:00
Dianne Hackborn
b99b7f51b0 am 4d85c98d: am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '4d85c98d833f6fed01b4bb84427a4b7514f95978':
  Remove fade animations from framework drawables.
2012-03-15 11:32:41 -07:00
Dianne Hackborn
4d85c98d83 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
2012-03-15 11:29:22 -07:00
Dianne Hackborn
42ef93fcc4 am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
2012-03-15 11:29:22 -07:00
Dianne Hackborn
33ace979a4 Merge "Remove fade animations from framework drawables." into ics-mr1 2012-03-15 11:27:43 -07:00
Scott Main
6c25ffb770 am 0b4ec63c: am 6513bceb: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit '0b4ec63cd1fe09aec34d1eac8bc8f5cc28450f6c':
2012-03-15 11:17:27 -07:00
Scott Main
a993d4b85a am fb058ddb: am 82916294: am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
* commit 'fb058ddb8b76513911daba970fde6098290f61d1':
  docs: remove link from GP logo
2012-03-15 11:17:22 -07:00
Junichi Monma
77d3a7a06c am 896a638b: (-s ours) am 41d72c86: Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop
* commit '896a638b34368f943a84e148a59f589ed172fbe1':
  DO NOT MERGE : New version of DroidSansFallback font
2012-03-15 11:17:19 -07:00
George Mount
f63c52ac87 Merge "Add scrolling editable text with a finger drag." 2012-03-15 10:54:30 -07:00
Android Git Automerger
bf324a1c28 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-15 10:38:42 -07:00
Eino-Ville Talvala
4d2ece12a6 Merge "Move CameraParameters.h to frameworks/native." 2012-03-15 10:34:00 -07:00
Scott Main
8fc949ebb1 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 '1fbc85d32ddd8a764d522ba56cae10ca0d6c5f93':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:25:56 -07:00
Scott Main
40b4f04ac3 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 '150107763d1b5ced8e70992268d7d6fc1888f7dd':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:25:31 -07:00
Scott Main
1fbc85d32d 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 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:22:35 -07:00
Scott Main
150107763d 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 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:22:33 -07:00
Scott Main
f32ab91414 Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1 2012-03-15 10:21:00 -07:00