Commit Graph

10023 Commits

Author SHA1 Message Date
Dianne Hackborn
d93df9cac9 am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit 'b37abe3867d582d68918d38f0684783f457543bb' into kraken

* commit 'b37abe3867d582d68918d38f0684783f457543bb':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:57:33 -07:00
Dianne Hackborn
b37abe3867 am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Merge commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp

* commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:41:42 -07:00
Grace Kloba
188bf8deb4 Revert "Use the content width to calculate the zoom overview"
This reverts commit 4a4f9886a7.

Fix http://b/issue?id=2577238
2010-04-07 18:37:32 -07:00
Dianne Hackborn
d3cc496760 Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo 2010-04-07 18:37:04 -07:00
Grace Kloba
11fa070d37 am d0010038: am c020ec57: am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:31:37 -07:00
Grace Kloba
c020ec5723 am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Merge commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken

* commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293':
  Cherry-pick https://android-git.corp.google.com/g/#change,38305
2010-04-07 18:26:38 -07:00
Grace Kloba
edee621f5c am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
Merge commit 'faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp

* commit 'faa2d970058557fa31d06d168b402d592c368aaf':
  Cherry-pick https://android-git.corp.google.com/g/#change,38305
2010-04-07 18:23:25 -07:00
Dianne Hackborn
559a787531 Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
mResources will be null if we failed loading them because the app
is on external storage that has been unmounted.

Change-Id: If0dbbdc0c3441fa10d0ab074568361524db1c8db
2010-04-07 18:19:41 -07:00
Grace Kloba
faa2d97005 Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo 2010-04-07 18:18:17 -07:00
Jaikumar Ganesh
4aae54cf29 Don't allow connection to profiles in TURNING_OFF state.
A similar change will be made for other profiles.
Bug: 2577713

Dr No: jsh/eastham

Change-Id: Ifca0fbb108e705acefbaeabff07fad83c08f7baa
2010-04-07 17:28:08 -07:00
Mike Reed
05b3720beb Cherry-pick https://android-git.corp.google.com/g/#change,38305
disable high-quality filtering during scrolling, until I can cached the scaled images.

Change-Id: I58fa779a8d9a23a20a0fdd93ea06c251b6c6ca8d

Fix http://b/issue?id=2574172
2010-04-07 17:09:55 -07:00
San Mehat
a334389373 am cf1a7a77: am 12ebde61: am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo 2010-04-07 16:45:31 -07:00
San Mehat
12ebde61a5 am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Merge commit '692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken

* commit '692329cf3f1512b3f0475b619058f9a10d9950a8':
  NetworkManagementService: Remove 'maxkbs' parameter from throttle API
2010-04-07 16:36:07 -07:00
San Mehat
692329cf3f am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp

* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
  NetworkManagementService: Remove 'maxkbs' parameter from throttle API
2010-04-07 16:32:29 -07:00
San Mehat
fd998a0caf Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo 2010-04-07 15:32:44 -07:00
San Mehat
f0db6e1853 NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Change-Id: I1cfbdac7d06478243931c6acec462da8e257f42f
Signed-off-by: San Mehat <san@google.com>
2010-04-07 15:22:10 -07:00
Doug Felt
e8e45f2c05 Refactor Styled utility functions into reusable objects.
This takes utility functions from Styled and a few other classes and
incorporates them into two new utility classes, TextLine and
MeasuredText.  The main point of this is to support shaping by skia,
to experiment with how this will look, this also introduces
character-based Arabic shaping.

MeasuredText is used by code that determines line breaks by generating
and examining character widths in logical order.  Factoring the code
in this way makes it usable by the ellipsize functions in TextUtils as
well as by StaticLayout.  This class takes over the caching of widths
and chars arrays that was previously performed by StyledText.  A small
number of MeasuredText objects are themselves cached by the class and
accesed using static obtain and recycle methods.  Generally only these
few cached instances are ever created.

TextLine is used by code that draws or measures text on a line.  This
unifies the line measuring and rendering code, and pushes assumptions
about how rtl text is treated closer to the points where skia code is
invoked.  TextLine implements the functions that were previously
provided by Styled, working on member arrays rather than
explicitly-passed arguments.  It implements the same kind of static
cache as MeasuredText.

TextLine and MeasureText simulate arabic glyph generation and shaping
by using ArabicShaping, ported with very minor changes from ICU4J's
ArabicShaping.  This class generates shaped Arabic glyphs and Lam-Alef
ligatures using Unicode presentation forms.  ArabicShaping is not
intended to be permanent, but to be replaced by real shaping from the
skia layer. It is introduced in order to emulate the behavior of real
shaping so that higher level code dealing with rendering shaped text
and cursor movement over ligatures can be developed and tested; it
also provides basic-level support for Arabic.

Since cursor movement depends on conjuncts whose formation is
font-dependent, cursor movement code that was formerly in Layout and
StaticLayout was moved into TextLine so that it can work on the shaped
text.

Other than these changes, the other major change is a rework of the
ellipsize utility functions to combine multiple branches into fewer
branches with additional state.

Updated copyright notices on new files.

Change-Id: I492cb58b51f5aaf6f14cb1419bdbed49eac5ba29
2010-04-07 14:54:51 -07:00
Fred Quintana
b3029c3d56 create a SyncManager WakeLock for each syncadapter
accountType/authority pair so that it will be easy to tell via
bugreport which sync adapter is holding the wake lock the most

http://b/issue?id=2571451
2010-04-07 14:24:58 -07:00
Ray Chen
f974b84b54 am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 13:52:52 -07:00
Dianne Hackborn
b4d32b5657 am c24a1498: am 7aed1e14: am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 2010-04-07 13:52:46 -07:00
Ray Chen
84d12f3fe7 am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken

* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:14:49 -07:00
Ray Chen
dbad286c46 am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp

* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:09:42 -07:00
Ray Chen
25c2dd60d4 Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00
Dianne Hackborn
7aed1e14b5 am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken

* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
2010-04-07 11:58:21 -07:00
Dianne Hackborn
d66e2b23a5 am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp

* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
2010-04-07 11:52:21 -07:00
Dianne Hackborn
4e80820ab5 Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Ack, we were acquiring the wrong lock at some points when
accessing the data structure!

Change-Id: I8bbc8e1ffa2e3e8a94bf7625e3d7f020c458eea2
2010-04-07 11:14:15 -07:00
Romain Guy
1d5c03ffa0 am dddcd6e1: am 388fe1b0: am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564 2010-04-07 10:43:43 -07:00
Romain Guy
388fe1b040 am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
Merge commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken

* commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
  Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:36:28 -07:00
Romain Guy
2a9ec9869e am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp

* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
  Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:32:34 -07:00
Leon Scroggins
23d9972218 am 1fa4428b: am 84d2d10d: am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:21:51 -07:00
Romain Guy
7b70f65892 Search for focusable views only after layout has happened when the window is first created.
Bug #2565564

Change-Id: I9eb58bbcba873ac1d6dc0b60b0de99e0e9979398
2010-04-07 10:15:18 -07:00
Ray Chen
b7c8c76180 Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
2010-04-07 10:14:04 -07:00
Leon Scroggins
84d2d10d36 am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit 'efaee761022305d74e63237d87809582514bd5e2' into kraken

* commit 'efaee761022305d74e63237d87809582514bd5e2':
  Show the microphone when the search box is opened from browser
2010-04-07 10:13:28 -07:00
Leon Scroggins
efaee76102 am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp

* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
  Show the microphone when the search box is opened from browser
2010-04-07 10:09:06 -07:00
Leon Scroggins
083c715d06 Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:04:50 -07:00
Adam Powell
57f65e04fd am 203cd5e0: am 85a650fe: am c696b0df: am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 2010-04-07 10:01:53 -07:00
Adam Powell
85a650fedf am c696b0df: am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit 'c696b0df1e41f7cbd09c034e47570e6510d5a2e3' into kraken

* commit 'c696b0df1e41f7cbd09c034e47570e6510d5a2e3':
  Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
2010-04-07 09:54:32 -07:00
Adam Powell
c696b0df1e am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77' into froyo-plus-aosp

* commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77':
  Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
2010-04-07 09:51:48 -07:00
Adam Powell
eb3d47e43a Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 2010-04-07 09:48:48 -07:00
Leon Scroggins
e7501c17e6 Show the microphone when the search box is opened from browser
Fix for http://b/issue?id=2549036

Also required moving the call to updateWidgetState to after the
update of mUserQuery so mUserQuery could be used as a comparison.

Change-Id: I4996f09c02751a6d74e8f517669025e4bdd709d8
2010-04-07 12:22:01 -04:00
Daniel Sandler
bbfc02e861 am 03e96acb: am aea1443b: am 93720cad: am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:52:35 -07:00
Daniel Sandler
aea1443b0d am 93720cad: am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Merge commit '93720cad0c2905e7d0a80aee154684396d8b0ed1' into kraken

* commit '93720cad0c2905e7d0a80aee154684396d8b0ed1':
  Add more WindowManager flags to ViewDebug.
2010-04-07 06:48:07 -07:00
Daniel Sandler
93720cad0c am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Merge commit 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp

* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
  Add more WindowManager flags to ViewDebug.
2010-04-07 06:44:04 -07:00
Daniel Sandler
c957ebef97 Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:40:26 -07:00
Daisuke Miyakawa
921e5f725f Modify comments.
Bug: 2576594
Change-Id: I7d38bd4c738befddeb4e7ce14ac84032fb764d9d
2010-04-07 19:36:34 +09:00
Daisuke Miyakawa
9fb4ace5f3 Merge "Add FLAG_REPRAIN_PHONE_NUMBER_FORMATTING." 2010-04-07 01:40:43 -07:00
Daisuke Miyakawa
ea08c40cba Add FLAG_REPRAIN_PHONE_NUMBER_FORMATTING.
Bug: 2329952
Change-Id: I263f581c8146abc372a2cb287e6e61766fefd9b6
2010-04-07 17:32:01 +09:00
Wu-cheng Li
f09b8a7f7b am e624acc4: am 1bab46c6: am 14111d14: am cae57d62: Fix SDK build. 2010-04-06 23:53:27 -07:00
Dan Egnor
ba3ce9fa9e am 7f903d3e: am 7da9fc2f: am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 23:48:07 -07:00
Wu-cheng Li
1bab46c648 am 14111d14: am cae57d62: Fix SDK build.
Merge commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf' into kraken

* commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf':
  Fix SDK build.
2010-04-06 23:12:29 -07:00