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

21759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
62accbcbaf am 02d8d1e0: am a240ce20: Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 23:47:52 -07:00
Joe Onorato
02d8d1e036 am a240ce20: Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 22:02:18 -07:00
Joe Onorato
a240ce208c Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 18:26:39 -07:00
Joe Onorato
a5c51373d4 Finish moving the policies out of frameworks/policies/base and into frameworks/base. 
Change-Id: Id3a0c06202b0f6f2206acf490c8655d340ee0556
 2010-04-06 20:21:30 -05: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
76194fd633 am 7f41a992: am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 17:56:34 -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
Jean-Baptiste Queru
84e6fb4b85 merge from kraken-plus-aosp 
Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d
 2010-04-06 16:38:00 -07:00
Jean-Baptiste Queru
7851b5402b merge from kraken 
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
 2010-04-06 16:36:09 -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
Jean-Baptiste Queru
b1b28e26d7 Merge policy from frameworks/policies/base 
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
 2010-04-06 15:44:22 -07:00
Jean-Baptiste Queru
cf37559e3f Merge policy from frameworks/policies/base 
Change-Id: I55bd6b5078290aa7cdeaae8d8b4141d744ccf152
 2010-04-06 15:44:11 -07:00
Jean-Baptiste Queru
4c7d35064c Merge policy from frameworks/policies/base 
Change-Id: Ieca556a1e9ef62f6450aac1dfd33e8c180e7eeeb
 2010-04-06 15:43:59 -07:00
Jean-Baptiste Queru
6e251d7d66 de-activate makefile 
Change-Id: I6def51dea7aab002f7dbbe1e2573f52a2caa94fe
 2010-04-06 15:43:25 -07:00
Jean-Baptiste Queru
f97c343422 de-activate makefile 
Change-Id: Ib249f20abd24b8e8f113eb80667f1a8f91b9a7a0
 2010-04-06 15:43:25 -07:00
Andreas Huber
ba56799fb9 am b93ae7ea: am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:57:43 -07:00
Andreas Huber
b93ae7ea24 am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 
Merge commit '3e8b89bd8d35525019080205e7221063748a3f0a' into kraken

* commit '3e8b89bd8d35525019080205e7221063748a3f0a':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
 2010-04-06 14:50:05 -07:00
Kenny Root
1fda41d8cc am 62057cdd: am 266bb3c5: am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo 2010-04-06 14:47:18 -07:00
Andreas Huber
3e8b89bd8d am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 
Merge commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7' into froyo-plus-aosp

* commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
 2010-04-06 14:46:14 -07:00
Andreas Huber
2be77a22a4 Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:43:05 -07:00
Kenny Root
62057cddfa am 266bb3c5: am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo 
Merge commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken

* commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3':
  Fix last character of password field being visible after rotation
 2010-04-06 14:38:59 -07:00
Kenny Root
266bb3c5de am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo 
Merge commit 'f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp

* commit 'f1b256f5198d12952302ef2b6214a79927918866':
  Fix last character of password field being visible after rotation
 2010-04-06 14:36:36 -07:00
Andreas Huber
548b7999fe Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance. 
Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
 2010-04-06 14:36:23 -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
Christopher Tate
6e6961a208 am b93107da: am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo 2010-04-06 12:52:32 -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
Dianne Hackborn
00cdbc6235 am 357bff46: am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 2010-04-06 12:52:20 -07:00
Christopher Tate
b93107daad am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo 
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken

* commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
  Fix 'bmgr restore'
 2010-04-06 12:43:23 -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
Dianne Hackborn
357bff46b8 am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 
Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken

* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
 2010-04-06 12:43:00 -07:00
Suchi Amalapurapu
1a456c142b am 728e4cc8: am e6fdab7f: am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 12:42:22 -07:00
Christopher Tate
ccb2c6cf3a am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo 
Merge commit '1bfcaa592cb10059d185d8408935571d16727f54' into froyo-plus-aosp

* commit '1bfcaa592cb10059d185d8408935571d16727f54':
  Fix 'bmgr restore'
 2010-04-06 12:38:50 -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
Dianne Hackborn
710312b3bb am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp

* commit '48bce4515d948971a122a1e17fd1919f81297d77':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
 2010-04-06 12:38:22 -07:00
Irfan Sheriff
656a66c364 am b6f7123b: am 7eeb44f2: am b2e6c01f: Disable tethering when airplane mode is enabled 2010-04-06 12:38:20 -07:00
Christopher Tate
1bfcaa592c Merge "Fix 'bmgr restore'" into froyo 2010-04-06 12:19:11 -07:00
Christopher Tate
1398e27bb0 Fix 'bmgr restore' 
Zero means success.  Fixes bug #2573785

Change-Id: I11bd4d85aa2b3a061aa37e085790ee8cd52d50a2
 2010-04-06 12:17:46 -07:00
Grace Kloba
54fccf8a07 Merge "Update the Webkit version." into froyo 2010-04-06 11:50:32 -07:00