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

1401 Commits

Author SHA1 Message Date
Joe Onorato
d07d6c6ea7 am a8624186: am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 2010-04-21 11:20:59 -07:00
Joe Onorato
a8624186a6 am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken

* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
  Add title to recent apps dialog.
 2010-04-21 11:12:29 -07:00
Joe Onorato
46fba3b9e1 am 52e70b25: Add title to recent apps dialog. 
Merge commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp

* commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
  Add title to recent apps dialog.
 2010-04-21 11:07:43 -07:00
Joe Onorato
52e70b25f8 Add title to recent apps dialog. 
Bug: 2614279

Change-Id: I45ebcd2e45140901df246db10f756c07864cccb4
 2010-04-21 14:00:44 -04:00
android-build SharedAccount
120c457672 manual merge 
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
 2010-04-15 16:36:34 -07:00
Dianne Hackborn
cd0d10f939 Introduce new API version to avoid breakage with the Froyo APIs; 
introduce padding in the resources to avoid cross-branch merge pain.

Change-Id: I9975f4320dfc625e3ed68dfdbbe94cc0c3b019f4
 2010-04-15 14:38:30 -07:00
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
Evan Millar
f82dcf4107 Merge "Clean up the fallback state of QuickContact" 2010-04-15 09:17:11 -07: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
Robert Greenwalt
59019368cf am eaa8b1a7: am 57e60854: am 22b3644a: Update the datause icons. 2010-04-15 06:38:02 -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
40d255112e Import revised translations 
Change-Id: Icdbd0bf88b18870dd3b063126e4559f6af3138a6
 2010-04-14 20:30:39 -07:00
Evan Millar
9a20aa74ca Clean up the fallback state of QuickContact 
-Show the generic avatar by default, until otherwise set
-Add padding to the nobadge asset so that it will be square
-Remove states from the nobadge asset since it is not actionable

Change-Id: Ide7da78782a0db9047de52af6f9c1f654fc6a1b5
 2010-04-14 16:45:07 -07:00
Daniel Sandler
a976eccf6b Merge "Missing resources for lock screen." into kraken 2010-04-14 12:15:04 -07:00
Robert Greenwalt
eaa8b1a7da am 57e60854: am 22b3644a: Update the datause icons. 
Merge commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b' into kraken

* commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b':
  Update the datause icons.
 2010-04-14 12:11:07 -07:00
Daniel Sandler
aa9b5b8171 Missing resources for lock screen. 
The manual integration (kraken change Ide3ad839) of froyo
change I6872c3ad skipped these.

Change-Id: I11102c4ac988cbcd91eb38b7d60e493079dd715e
 2010-04-14 15:03:42 -04:00
Robert Greenwalt
57e60854f3 am 22b3644a: Update the datause icons. 
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp

* commit '22b3644ac2027d055a6b187c979ef492ee6fb082':
  Update the datause icons.
 2010-04-14 12:03:33 -07:00
Robert Greenwalt
22b3644ac2 Update the datause icons. 
bug:2576057
Change-Id: Idf57d59aecb9bcff635dafa1e77d90a8737a0c08
 2010-04-14 09:13:53 -07:00
Robert Greenwalt
6ff9d5130c am 13ec98f3: am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults 2010-04-13 16:29:12 -07:00
Robert Greenwalt
847486293b am a466ffe0: am d3bb93f6: Add build config values for data use defaults 
Merge commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e' into kraken

* commit 'a466ffe042ca0a7ef14d3942114f3ea916db225e':
  Add build config values for data use defaults
 2010-04-13 16:09:19 -07:00
Robert Greenwalt
a466ffe042 am d3bb93f6: Add build config values for data use defaults 
Merge commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp

* commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
  Add build config values for data use defaults
 2010-04-13 16:07:19 -07:00
Robert Greenwalt
d3bb93f687 Add build config values for data use defaults 
Don't use hard coded defaults - use build configs instead.

Iface is now ONLY set by config so gservices doesn't need to.

bug:2576057
Change-Id: I8f9e3bc51af3b1cdf8bb4290a43197d9c01e2a14
 2010-04-13 15:44:34 -07:00
Daniel Sandler
aedb01dcc7 am ba7aa766: am 8dc634e8: am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo 2010-04-13 10:37:59 -07:00
Daniel Sandler
8dc634e82f am b0cc22b4: am 15683534: Merge "Hide e-call button in layout." into froyo 
Merge commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be' into kraken

* commit 'b0cc22b4059ea49623defa1c118db9abdd59a0be':
  Hide e-call button in layout.
 2010-04-13 06:10:10 -07:00
Daniel Sandler
b0cc22b405 am 15683534: Merge "Hide e-call button in layout." into froyo 
Merge commit '15683534d1f1ca76a9a59ed921219db46ff5f800' into froyo-plus-aosp

* commit '15683534d1f1ca76a9a59ed921219db46ff5f800':
  Hide e-call button in layout.
 2010-04-13 06:05:20 -07:00
Daniel Sandler
15683534d1 Merge "Hide e-call button in layout." into froyo 2010-04-13 06:00:02 -07:00
android-build SharedAccount
824e5d6b07 am e413fc11: manual merge 2010-04-12 17:01:36 -07:00
Christopher Tate
5c7a69c3d6 am 6a75d685: am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo 
Merge commit '6a75d6850c77fb48daba7700621856605ab60569' into kraken

* commit '6a75d6850c77fb48daba7700621856605ab60569':
  SDK: more backup/restore documentation work
 2010-04-12 16:23:35 -07:00
Christopher Tate
6a75d6850c am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo 
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp

* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
  SDK: more backup/restore documentation work
 2010-04-12 16:18:16 -07:00
Christopher Tate
4e14a82912 SDK: more backup/restore documentation work 
Still not complete, but here's a lot more of the necessary documentation.
Submitting a checkpoint seems prudent.

Bug #2465360

Change-Id: Ifff60d57e4b24cee21f3a34f5f50e290d377c386
 2010-04-12 15:42:16 -07:00
Gilles Debunne
78aaa97b77 New MipmapDrawable class. 
This Drawable holds different scaled version of a Drawable and use the appropriate one
depending on its actual bounds to minimize scaling artifacts.

Change-Id: I4ced045d73c1ddd8982d9aaf39c3599b3ac58a16
 2010-04-12 11:12:32 -07:00
Wei Huang
6aa776fb76 am 235af299: am 92671e5e: am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-10 11:59:03 -07:00
Wei Huang
92671e5e4d am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 
Merge commit '997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken

* commit '997b38036f5ac5db69191d090c8c3c1d1b05aace':
  bug #2542580: add the appropriate mdpi asset for chat icon.
 2010-04-10 11:47:51 -07:00
Wei Huang
997b38036f am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 
Merge commit 'c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da' into froyo-plus-aosp

* commit 'c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da':
  bug #2542580: add the appropriate mdpi asset for chat icon.
 2010-04-10 11:41:45 -07:00
Wei Huang
927a3c96d1 bug #2542580: add the appropriate mdpi asset for chat icon. 
Change-Id: I474eb5b8fe83bbc7f92005de651444447c8624e7
 2010-04-09 15:27:10 -07:00
Robert Greenwalt
673a2f6273 am b2216375: am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:30:55 -07:00
Robert Greenwalt
da0498c598 am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken

* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
  Updating some notificiation UI for Throttling
 2010-04-08 16:25:54 -07:00
Robert Greenwalt
6cf3d4aa76 am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo 
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp

* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
  Updating some notificiation UI for Throttling
 2010-04-08 16:18:31 -07:00
Robert Greenwalt
cc691f5061 Merge "Updating some notificiation UI for Throttling" into froyo 2010-04-08 16:09:31 -07:00
Robert Greenwalt
c87dc6dc90 Updating some notificiation UI for Throttling 
String update and make one an ongoing notification.

bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
 2010-04-08 16:00:26 -07:00
Jeff Brown
4879b52ea0 am 281a687c: am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 2010-04-08 13:58:54 -07:00
Robert Greenwalt
ac6ec41b67 resolved conflicts for merge of 4e33e9c1 to master 
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
 2010-04-08 13:54:58 -07:00
Jeff Brown
a07fd3c5a6 am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 
Merge commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken

* commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
 2010-04-08 13:51:48 -07:00
Jeff Brown
a30b596d6a am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp

* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
  @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
 2010-04-08 13:49:55 -07:00
Jeff Brown
ec7c78fbf5 @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE 
Bug: b/2553489
Change-Id: I681b3f9a243777b931298cc93c9d34c8d7eae0f2
 2010-04-08 13:45:06 -07:00
Robert Greenwalt
6646cf7af9 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
 2010-04-08 12:49:38 -07:00
Robert Greenwalt
6f72a313a0 am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
 2010-04-08 12:45:51 -07:00
Robert Greenwalt
2b4b573801 Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data. 
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
 2010-04-08 12:34:45 -07:00
Dianne Hackborn
7339f035b9 am 306e2b50: am 2be9a0e7: am 2c5c9bb8: am 2670105e: Merge "Fix issue #2580316: Contacts and Phone app not supporting landscape mode..." into froyo 2010-04-08 11:45:21 -07:00