Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,779 Commits 3 Branches 0 Tags
bbfc02e8610c840d57f2f3b3f3f5253a20042869
Commit Graph

10043 Commits

Author SHA1 Message Date
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
Wu-cheng Li
14111d1444 am cae57d62: Fix SDK build. 
Merge commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8' into froyo-plus-aosp

* commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8':
  Fix SDK build.
 2010-04-06 23:08:51 -07:00
Wu-cheng Li
cae57d6205 Fix SDK build. 
Change-Id: I2d816f8e765678fa1dc07c1f50cef51026e66a10
 2010-04-07 13:54:49 +08:00
Dan Egnor
7da9fc2f4f am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken

* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
  Comment-only change to clarify the role and use of IntentService
 2010-04-06 22:06:48 -07:00
Dan Egnor
aa94842c1a am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo 
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp

* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
  Comment-only change to clarify the role and use of IntentService
 2010-04-06 22:03:04 -07:00
Dan Egnor
9807d6a5b7 Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 20:50:25 -07:00
Dan Egnor
6e3d9884e4 Comment-only change to clarify the role and use of IntentService 
Change-Id: I0adb26daccc8d1559f96892cc31694fbf6ab4583
 2010-04-06 19:19:43 -07:00
Gilles Debunne
ff28490f5c Merge "ExpandableListView tests moved to CTS." 2010-04-06 18:03:19 -07:00
Brett Chabot
6c00fbe32e am 76194fd6: am 7f41a992: am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 18:00:11 -07:00
Brett Chabot
7f41a9922a am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 
Merge commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb' into kraken

* commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb':
  Add makefile so package manager test apks can get buitl from root.
 2010-04-06 17:44:33 -07:00
Gilles Debunne
50f79c95f1 ExpandableListView tests moved to CTS. 
Tests were duplicates of those in CTS.

Change-Id: I70d7cb46e58bdbca6958467b9b2e650e7546292b
https://android-git.corp.google.com/g/#change,47984
http://b/issue?id=2541389
 2010-04-06 17:37:14 -07:00
Brett Chabot
f6d4158055 am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 
Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp

* commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
  Add makefile so package manager test apks can get buitl from root.
 2010-04-06 17:36:49 -07:00
Brett Chabot
0990511f3f Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 16:31:14 -07:00
Brett Chabot
5a2190877c Add makefile so package manager test apks can get buitl from root. 
Change-Id: I89e3d50793a48a404c7d8e5699baea8b195b7684
 2010-04-06 16:23:44 -07:00
Kenny Root
f1b256f519 Merge "Fix last character of password field being visible after rotation" into froyo 2010-04-06 14:33:24 -07:00
Daniel Lehmann
04867ab7c6 am ba3147d1: am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 2010-04-06 14:28:37 -07:00
Daniel Lehmann
ba3147d157 am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken

* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
 2010-04-06 14:17:57 -07:00
Daniel Lehmann
140d040b6a am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp

* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
 2010-04-06 14:14:21 -07:00
Daniel Lehmann
d8b9b51182 Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 2010-04-06 14:10:04 -07:00
Devin Taylor
71ab21a02a Fix last character of password field being visible after rotation 
This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.

Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150
 2010-04-06 13:25:19 -07:00
Grace Kloba
30fa3f2377 am cbc7fe0d: am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo 2010-04-06 12:52:28 -07:00
Romain Guy
b8d980227e am d00edffb: am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 2010-04-06 12:52:24 -07:00
Grace Kloba
cbc7fe0df6 am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo 
Merge commit '8dbf5105739db2354057be445483a63ec96376f0' into kraken

* commit '8dbf5105739db2354057be445483a63ec96376f0':
  Update the Webkit version.
 2010-04-06 12:43:19 -07:00
Romain Guy
d00edffbae am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken

* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
  Correctly resize dialogs when measured in WRAP_CONTENT
 2010-04-06 12:43:16 -07:00
Grace Kloba
8dbf510573 am 54fccf8a: Merge "Update the Webkit version." into froyo 
Merge commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46' into froyo-plus-aosp

* commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46':
  Update the Webkit version.
 2010-04-06 12:38:47 -07:00
Romain Guy
92b46ffb2c am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp

* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
  Correctly resize dialogs when measured in WRAP_CONTENT
 2010-04-06 12:38:33 -07:00
Grace Kloba
54fccf8a07 Merge "Update the Webkit version." into froyo 2010-04-06 11:50:32 -07:00
Grace Kloba
a3562c6853 Update the Webkit version. 
Fix http://b/issue?id=2571957
 2010-04-06 11:23:01 -07:00
Romain Guy
2e4f426bbc Correctly resize dialogs when measured in WRAP_CONTENT 
Bug #2549649

If the window had a different size than its content but the content had already
been measured with the appropriate size, the window would not be resized. This
happens in wrap_content windows (dialogs.) This change simply adds a new codition
to window resizing: if the window is wrap_content, not as big as it can be and
not as big as its content, it gets resized.

Change-Id: I1d82d03af5a15c9ad8dffa0511d5f6d522578285
 2010-04-06 11:07:52 -07:00
Daniel Lehmann
b45c047ba0 Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again 
Bug:2572239

Change-Id: I5fedd6cac64d495ba208ddcb45a7d09a05bb9a65
 2010-04-06 10:44:35 -07:00
Bjorn Bringert
0981da6951 am 792989cc: am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 09:09:49 -07:00
Joe Onorato
a05b6883b5 am e0da887e: am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 09:06:56 -07:00
Bjorn Bringert
792989cc8f am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo 
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken

* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
  Guard against NPE in SearchManagerService
 2010-04-06 09:00:51 -07:00
Bjorn Bringert
16419aca40 am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo 
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp

* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
  Guard against NPE in SearchManagerService
 2010-04-06 08:57:01 -07:00
Bjorn Bringert
7d2511b722 Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 08:53:12 -07:00
Joe Onorato
e0da887e64 am 703cb724: am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 
Merge commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65' into kraken

* commit '703cb72442461a3cfb3ffd0d15968d7c40eaba65':
  Redo the look of the recent apps switcher
 2010-04-06 08:41:50 -07:00
Joe Onorato
703cb72442 am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo 
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp

* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
  Redo the look of the recent apps switcher
 2010-04-06 08:36:05 -07:00
Joe Onorato
fa588fc374 Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Joe Onorato
fd6c969c8c Redo the look of the recent apps switcher 
Change-Id: I913c3f68f487e7ccf20a014c26ab85119e991484
 2010-04-06 10:30:38 -05:00
Bjorn Bringert
28fe20930e Guard against NPE in SearchManagerService 
Bug http://b/issue?id=2570569

Change-Id: I72395f847b3dbc699c73358e14421d624f40fcf3
 2010-04-06 14:48:41 +01:00
Daisuke Miyakawa
1d707fcd2a Merge "Let vCard importer/exporter select charset. There are some other bug where charset for import/export is used during vCard handling." 2010-04-05 21:42:45 -07:00