drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,726 Commits 1 Branch 0 Tags
Commit Graph

22726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
212db7d3f8 Added MultiSelectListPreference 
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.

MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.

Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
 2010-04-15 10:18:17 -07:00
Vasu Nori
062fc7ce36 allow apps to specify actions to take on database corruption error 
let the user specify an interface impl class to specify the actions
to take when db corruption is detected.
this class is specified when the database is opened/created.

Change-Id: I84eb57208c8fedfa7235805b0ec58165efdc1560
 2010-04-15 09:31:47 -07:00
Evan Millar
f82dcf4107 Merge "Clean up the fallback state of QuickContact" 2010-04-15 09:17:11 -07:00
Daniel Sandler
e54de6da82 Merge "Lockscreen improvements from froyo." 2010-04-15 08:38:55 -07:00
Daniel Sandler
368de81b71 Lockscreen improvements from froyo. 
(In kraken as Ide3ad839.)

	I6872c3ad135bc34348adafa76e08a3878f1b506f
	"Add emergency call button to PUK'd lockscreen."
	Bug: 2568732

	I5ad8745443fc97225af9efb938e4640cfc29b5d7
	"Restore text field used by sliding tab to give ringer
	mode feedback."
	Bug: 2587358

Change-Id: I631d8e73571ccd566dc0ad80941bd739e614b9f6
 2010-04-15 11:37:05 -04:00
Mike LeBeau
70b3fb4a77 For search suggestions in the search dialog, allow the 'title' 
line of text to be up to 2 lines (rather than the usual 1) if
no 'description' line is provided.

Change-Id: Ibc60d72868a4ad9630d38ee9b8cfe3f37c736e64
 2010-04-15 11:35:47 -04:00
Leon Scroggins III
dfbb1f4209 Call InputMethodManager.updateSelection at draw time. 
Bug 2499860

Change-Id: Ie0b2a16c12ba59d30e3de5b614753e93b526d8cc
 2010-04-15 11:14:32 -04:00
Kenny Root
95bf9f6a0f am 2349dc5d: am fa22de79: Merge "Import revised translations" into froyo 
Merge commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319' into kraken

* commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319':
  Import revised translations
 2010-04-15 06:43:29 -07:00
Eric Laurent
36b763e952 am 5c14f2d0: am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode. 2010-04-15 06:38:55 -07:00
Daniel Sandler
9fa47c0831 am a976eccf: Merge "Missing resources for lock screen." into kraken 2010-04-15 06:38:47 -07:00
Eric Laurent
491f250583 am 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-15 06:38:39 -07:00
Andrei Popescu
7a8a91d1b0 am 0476f7a0: am 6083f5eb: am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 2010-04-15 06:38:29 -07:00
Dianne Hackborn
97107f0497 am 093d621c: am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 2010-04-15 06:38:20 -07:00
James Dong
e3fcad3432 am fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 2010-04-15 06:38:10 -07:00
Robert Greenwalt
59019368cf am eaa8b1a7: am 57e60854: am 22b3644a: Update the datause icons. 2010-04-15 06:38:02 -07:00
Robert Greenwalt
f799996531 am c059f342: am b26c8dd4: am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo 2010-04-15 06:37:52 -07:00
Leon Scroggins
67329aa3ec am 7ba155bf: am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-15 06:37:43 -07:00
Kristian Monsen
c8c5363df3 am d2688cb1: am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-15 06:37:33 -07:00
Kristian Monsen
42ae4885ed am 11d60e0b: am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-15 06:37:21 -07:00
Jean-Baptiste Queru
c716307594 am 31a17033: fix unintentional drift 2010-04-15 06:36:35 -07:00
Jean-Baptiste Queru
561f735eac am 0b23c143: (-s ours) manual merge 2010-04-15 06:35:59 -07:00
Kenny Root
2349dc5d7a am fa22de79: Merge "Import revised translations" into froyo 
Merge commit 'fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp

* commit 'fa22de7993f94d338330a888bdc2aeaaf857c719':
  Import revised translations
 2010-04-15 06:00:18 -07:00
Kenny Root
fa22de7993 Merge "Import revised translations" into froyo 2010-04-15 05:55:00 -07:00
Mike Lockwood
b2378aaa07 am f5a886d5: am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 
Merge commit 'f5a886d5210320724236ce6efde926e0a3c24997' into kraken

* commit 'f5a886d5210320724236ce6efde926e0a3c24997':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
 2010-04-15 05:53:05 -07:00
Mike Lockwood
f5a886d521 am 93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 
Merge commit '93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp

* commit '93597ed1839de164c81f83832d4c2373ea32ac8f':
  Fix wakelock leak in PowerManagerService.sendNotificationLocked()
 2010-04-15 05:48:26 -07:00
Mike Lockwood
93597ed183 Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo 2010-04-15 05:45:21 -07:00
Dianne Hackborn
fa27f8c0d5 am ded77760: am 90d3f458: API 8! 
Merge commit 'ded77760d1135cdc76f7c1fdf0e156165c1aeaf3' into kraken

* commit 'ded77760d1135cdc76f7c1fdf0e156165c1aeaf3':
  API 8!
 2010-04-14 22:31:06 -07:00
Dianne Hackborn
ded77760d1 am 90d3f458: API 8! 
Merge commit '90d3f458d99d9c0f35f9ee295997661c2493cb58' into froyo-plus-aosp

* commit '90d3f458d99d9c0f35f9ee295997661c2493cb58':
  API 8!
 2010-04-14 22:27:10 -07:00
Dianne Hackborn
90d3f458d9 API 8! 
Change-Id: I30a6a99f63a81900751f2afccf03430ddef82833
 2010-04-14 22:08:29 -07:00
Kenny Root
40d255112e Import revised translations 
Change-Id: Icdbd0bf88b18870dd3b063126e4559f6af3138a6
 2010-04-14 20:30:39 -07:00
Robert Greenwalt
d38a767c92 am 1424d1d2: am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 
Merge commit '1424d1d22e199c716c5d248611e58ce7c3f15c7e' into kraken

* commit '1424d1d22e199c716c5d248611e58ce7c3f15c7e':
  Sholes mobile iface comes/goes - handle the reset
 2010-04-14 20:30:31 -07:00
Suchi Amalapurapu
c260b08e59 am 0751d1ea: am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. 
Merge commit '0751d1eaad55603eaeb0f035a55935f713ab0476' into kraken

* commit '0751d1eaad55603eaeb0f035a55935f713ab0476':
  Revert "Add ordered broadcast when removing packages."
 2010-04-14 20:30:27 -07:00
Robert Greenwalt
1424d1d22e am 8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 
Merge commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp

* commit '8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
  Sholes mobile iface comes/goes - handle the reset
 2010-04-14 20:25:51 -07:00
Suchi Amalapurapu
0751d1eaad am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well. 
Merge commit 'deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp

* commit 'deb69370ef9a786940ae49411ba657410361b4f1':
  Revert "Add ordered broadcast when removing packages."
 2010-04-14 20:25:48 -07:00
Robert Greenwalt
8090edae9e Merge "Sholes mobile iface comes/goes - handle the reset" into froyo 2010-04-14 20:23:45 -07:00
Suchi Amalapurapu
deb69370ef Revert "Add ordered broadcast when removing packages." 
Couple of cosmetic fixes as well.

This reverts commit 0c1285fa979e8b8c170f31d0ef1b4e5d9ddcf6b1.

Conflicts:

	services/java/com/android/server/PackageManagerService.java

Change-Id: Ife0f9f80525f4a41b1f8c12ffc2de62e061e7d5b
 2010-04-14 19:58:22 -07:00
Dianne Hackborn
ccb87e11da am 68ca59e9: am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo 
Merge commit '68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken

* commit '68ca59e9e69ab4c997987fb0390382a2461386eb':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
 2010-04-14 19:09:52 -07:00
Dianne Hackborn
68ca59e9e6 am b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo 
Merge commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0' into froyo-plus-aosp

* commit 'b0ef1442866ec52a772e6edfab732a2c987bbee0':
  Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
 2010-04-14 19:05:11 -07:00
Dianne Hackborn
b0ef144286 Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo 2010-04-14 19:02:00 -07:00
Dmitri Plotnikov
949c34854a am 13932d85: am 5304d8fd: Merge "Introducing "strict project map"." into froyo 
Merge commit '13932d85066f191db09c4a2fecfa563f0d63d7b7' into kraken

* commit '13932d85066f191db09c4a2fecfa563f0d63d7b7':
  Introducing "strict project map".
 2010-04-14 18:40:17 -07:00
Dmitri Plotnikov
13932d8506 am 5304d8fd: Merge "Introducing "strict project map"." into froyo 
Merge commit '5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp

* commit '5304d8fdc9064f2831ef16db9242f17110287997':
  Introducing "strict project map".
 2010-04-14 18:36:36 -07:00
Suchi Amalapurapu
7322b9f0e8 am 2ef6e442: am 28b2fdc5: Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storag 
Merge commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73' into kraken

* commit '2ef6e44269ba3c9f6b5d22352461555ebab33b73':
  Dont fall back to installing on sdcard when internal storage is filled up
 2010-04-14 18:34:21 -07:00
Dmitri Plotnikov
5304d8fdc9 Merge "Introducing "strict project map"." into froyo 2010-04-14 18:33:54 -07:00
Suchi Amalapurapu
2ef6e44269 am 28b2fdc5: Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard i 
Merge commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c' into froyo-plus-aosp

* commit '28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c':
  Dont fall back to installing on sdcard when internal storage is filled up
 2010-04-14 18:31:37 -07:00
Suchi Amalapurapu
28b2fdc5ee Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests" into froyo 2010-04-14 18:28:22 -07:00
Mathias Agopian
24af70e8bc am e7d5a2f9: am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 
Merge commit 'e7d5a2f9ae47d8ea8face3f1e451314ed36f4026' into kraken

* commit 'e7d5a2f9ae47d8ea8face3f1e451314ed36f4026':
  fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
 2010-04-14 18:25:21 -07:00
Suchi Amalapurapu
315a5fb91d Dont fall back to installing on sdcard when internal storage is filled up 
when the install location is set to internal only. Similary if install
location is set to external only(via adb), dont fall back to installing on
internal storage if sdcard is filled up.
If nothing is specified ie install location is set to let system decide,
we just check on internal storage.
Fix tests

Change-Id: I7400ccc131782d9c45284bd9ebd0dee43a3b412b
 2010-04-14 18:24:06 -07:00
Mathias Agopian
e7d5a2f9ae am 45423465: Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 
Merge commit '454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp

* commit '454234657cd9b0835ecd9c6704cbcd5369e926b1':
  fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
 2010-04-14 18:22:33 -07:00
Mathias Agopian
454234657c Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo 2010-04-14 18:18:44 -07:00
Suchi Amalapurapu
180ee65983 am 1e21ec92: am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo 
Merge commit '1e21ec923404a000c46590e4a87ae9ebe87e628e' into kraken

* commit '1e21ec923404a000c46590e4a87ae9ebe87e628e':
  Add ordered broadcast when removing packages.
 2010-04-14 18:18:29 -07:00