Commit Graph

13255 Commits

Author SHA1 Message Date
Dianne Hackborn
347262622b am a1205f07: am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'

* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
  Modify native ALooper to take an explicit ident.
2010-09-07 18:52:06 -07:00
Ying Wang
7d8bb82dca Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge
Conflicts:
	core/res/res/values/public.xml

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
2010-09-07 18:39:03 -07:00
Romain Guy
5ebac4cc97 Merge "Correctly set the viewport on window resize." 2010-09-07 17:17:12 -07:00
Romain Guy
53389bdcdf Correctly set the viewport on window resize.
Change-Id: Idec325264d85feda76d4cda00fa511aaac82cf64
2010-09-07 17:16:32 -07:00
Dianne Hackborn
a1205f07a6 am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp

* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
  Modify native ALooper to take an explicit ident.
2010-09-07 16:38:45 -07:00
Dianne Hackborn
2d3739d479 Merge "Modify native ALooper to take an explicit ident." into gingerbread 2010-09-07 16:32:48 -07:00
Dianne Hackborn
42c03e579a Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd.  This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
2010-09-07 15:46:55 -07:00
Makoto Onuki
1006c842f1 am 3f6e4d56: am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '3f6e4d56bba393ac556a672202e00bc417784ce8'

* commit '3f6e4d56bba393ac556a672202e00bc417784ce8':
  Don't fall through from TOKEN_EMAIL_LOOKUP
2010-09-07 15:16:44 -07:00
Dianne Hackborn
d0438da05c am 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1'

* commit '75f0024cf40eadb2cdaa6ae53409c515b68f21c1':
  Fixes to battery stats debug output.
2010-09-07 15:16:38 -07:00
Dianne Hackborn
4970675316 am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'

* commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
  Add system property to turn off scheduling groups.
2010-09-07 14:47:51 -07:00
Joe Onorato
d348ea6e0a am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp

* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
  Expose the TextAppearance.StatusBar.* styles.
2010-09-07 14:46:08 -07:00
Joe Onorato
1f6a21c237 Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 2010-09-07 14:41:12 -07:00
Makoto Onuki
3f6e4d56bb am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
2010-09-07 14:34:19 -07:00
Makoto Onuki
1cc86da61a Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Dianne Hackborn
75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
2010-09-07 14:15:17 -07:00
Joe Onorato
ccfc1c1ea1 Expose the TextAppearance.StatusBar.* styles.
Change-Id: I6e1e68ab26495290d480f4fb75facedd6cd62908
2010-09-07 17:12:10 -04:00
Dianne Hackborn
b5e3165129 Fixes to battery stats debug output.
Change-Id: I32e7cad9633b8c517a74573069e426d9f835a83d
2010-09-07 14:09:36 -07:00
Vasu Nori
2e8b36cc01 Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff" 2010-09-07 13:23:28 -07:00
Vasu Nori
422dad0f50 android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff
Change-Id: Icf221a8e8d4c281f7719875816835ad7dfe7f3d1
2010-09-07 12:56:57 -07:00
Romain Guy
018b0d2918 Merge "Use static final debug fields." 2010-09-07 12:42:43 -07:00
Romain Guy
5429e1d102 Use static final debug fields.
Change-Id: I304c39f54f609729bcec581091f285b2baa6fefa
2010-09-07 12:39:45 -07:00
Adam Cohen
cf393c52f9 Merge "-> Implemented new visualization for StackView -> Cleaning up the method for creating the blue outline -> Reimplmented onMeasure for StackView and AdapterViewAnimator" 2010-09-07 12:32:45 -07:00
Romain Guy
e04a3811f2 Merge "Temporarily disable fading edges if solidColor=0 and hw is on." 2010-09-07 12:02:38 -07:00
Romain Guy
14cd0653e4 Temporarily disable fading edges if solidColor=0 and hw is on.
Change-Id: I430d8d4d00cbabc99644b98ea832460339c196d8
2010-09-07 12:01:38 -07:00
Michael Kolb
d9b447ca28 Merge "Add setting for on screen zoom buttons enables to use pinch to zoom without showing the on screen buttons" 2010-09-07 11:50:54 -07:00
Michael Kolb
6fe3b421fd Add setting for on screen zoom buttons
enables to use pinch to zoom without
  showing the on screen buttons

Change-Id: Ifd08d11232e2a32178a89e559b6f1f645bf627b9
2010-09-07 11:46:57 -07:00
Dianne Hackborn
b8bcfed552 am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
  Add system property to turn off scheduling groups.
2010-09-07 11:30:08 -07:00
Dianne Hackborn
f703b77c96 Merge "Add system property to turn off scheduling groups." into gingerbread 2010-09-07 11:27:26 -07:00
Dianne Hackborn
84bb52ed61 Add system property to turn off scheduling groups.
Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00
Brad Fitzpatrick
cbf16ebdab am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1'

* commit 'c19c9e4ee20512ba29e6e54aee06aa16413901f1':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:18:39 -07:00
Brad Fitzpatrick
c19c9e4ee2 am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp

* commit 'b1104b3713febb75164938a465c3022e1879245f':
  Make SharedPreferencesBackupHelper wait for async SharedPreference writes
2010-09-07 11:15:01 -07:00
Brad Fitzpatrick
b1104b3713 Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread 2010-09-07 11:12:51 -07:00
Eric Fischer
aab7375799 am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp

* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:08:19 -07:00
Eric Fischer
745e751b25 Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:03:26 -07:00
Steve Block
85a033af1a Merge "Adds a test case for WebAddress where the path component does not have a leading slash" 2010-09-07 10:59:18 -07:00
Steve Block
8bb37f7ffb Adds a test case for WebAddress where the path component does not have a leading slash
When a URL is malformed because the path does not start with a slash,
we assume that the path starts with the first character that is not
valid in the host and insert a leading slash. This is the reason why
the regex for the path component does not force a leading slash.

Bug: 1011602
Change-Id: I8efe46c058d2ee2d1a6a4406ee25dc021315222b
2010-09-07 18:57:41 +01:00
Kenny Root
c99b2b857c am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6'

* commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6':
  Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:52:13 -07:00
Kenny Root
f17bd19acb am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity
2010-09-07 10:49:22 -07:00
Makoto Onuki
a362e1d794 Don't fall through from TOKEN_EMAIL_LOOKUP
Change-Id: Ifc08f26ba93496cfa53cd83c7df0e986ea4ece4b
2010-09-07 10:46:59 -07:00
Kenny Root
2cb3e83654 Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread 2010-09-07 10:46:14 -07:00
Kenny Root
6798b62e92 Use new nativeLibraryPath field for NativeActivity
Instead of being naughty and guessing the native library path from
dataDir, use the new nativeLibraryPath field because it can be on SD
card now.

Change-Id: I284bde42e0b0114366e412eb7212af22b47208d8
2010-09-07 10:44:21 -07:00
Steve Block
582deec1f3 Fixes a problem with URL parsing when the host ends with a dot
The WebAddress class provides a lenient parser for URLs. Currently, it
identifies the host portion with the regex [<chars>]+(\.[<chars>]+)* where
<chars> is the set of characters valid for the host name. This pattern excludes
the case where the host ends with a dot, which is valid possibility. As a
result, any trailing dot is pushed into the path component. Since we add a
leading slash to the path if one is missing, the result is a path that begins
with '/.'.

This fix changes the host regex to [<chars>]+[<chars>\.]* which allows trailing
dots and fixes the problem.

Bug: 2337042
Change-Id: I310512531787e0f742988f5d815ad944fd39e059
2010-09-07 13:22:23 +01:00
Brad Fitzpatrick
6f9d58ac62 Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Fixes a potential race with backups.

Change-Id: I73492c0384091cedd7802109257312387fcd43f9
2010-09-06 22:18:39 -07:00
Brad Fitzpatrick
32e298511a am 612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '612ff27425cf2976396d992f32b58ab900c7d708' into gingerbread-plus-aosp

* commit '612ff27425cf2976396d992f32b58ab900c7d708':
  Quell annoying Java ascii/unicode warning.
2010-09-06 19:34:43 -07:00
Brad Fitzpatrick
612ff27425 Quell annoying Java ascii/unicode warning.
This fix is already in master, so just cherry-picking it here too.

Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a
2010-09-06 19:22:09 -07:00
Adam Cohen
839f4a54e5 -> Implemented new visualization for StackView
-> Cleaning up the method for creating the blue outline
-> Reimplmented onMeasure for StackView and AdapterViewAnimator

Change-Id: I59ce063661d59412de05d1a471644674f83bb7d1
2010-09-03 18:06:00 -07:00
Jim Miller
be988e3a39 Merge "Update RecentApplications to use shared Carousel widget." 2010-09-03 17:58:31 -07:00
Jim Miller
783cb60ddb Update RecentApplications to use shared Carousel widget.
Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
2010-09-03 17:44:57 -07:00
Kenny Root
7e955e7cce am a060b5f7: am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit 'a060b5f73863f4b5f161674a9c5ac0a0d8d76072'

* commit 'a060b5f73863f4b5f161674a9c5ac0a0d8d76072':
  Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:10:48 -07:00
Kenny Root
a060b5f738 am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread
Merge commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032' into gingerbread-plus-aosp

* commit '6dc003a73f7f01aa5dd5831e777e2aa44f65b032':
  Reduce footprint of Signature from ~7000 to ~1448
2010-09-03 17:07:15 -07:00