summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | am bc32f210: Merge change I88e7aada into eclairDaniel Sandler2009-11-175-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bc32f210e2801860d47c0cf5236b52ae743bc1f8' into eclair-mr2 * commit 'bc32f210e2801860d47c0cf5236b52ae743bc1f8': New icons for live wallpaper picker.
| | * | Merge change I88e7aada into eclairAndroid (Google) Code Review2009-11-175-3/+3
| | |\| | | | | | | | | | | | | | | | | * changes: New icons for live wallpaper picker.
| | | * New icons for live wallpaper picker.Daniel Sandler2009-11-165-3/+3
| | | |
* | | | am 7d227e98: (-s ours) am b6160c3a: (-s ours) Import revised translations. ↵Eric Fischer2009-11-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '7d227e9821b8df7ee6c4c794e82442205c87e795' * commit '7d227e9821b8df7ee6c4c794e82442205c87e795': Import revised translations. DO NOT MERGE
| * | | am b6160c3a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-11-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b6160c3a1823638ffe9fb5cf2f2fead4a3d9c4e2' into eclair-mr2 * commit 'b6160c3a1823638ffe9fb5cf2f2fead4a3d9c4e2': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2009-11-161-6/+3
| | |/
* | | am 9bfda05c: (-s ours) am 7ce3ba55: (-s ours) Import revised translations. ↵Eric Fischer2009-11-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '9bfda05c65e3d7beb78d47c706531ae100f2b62f' * commit '9bfda05c65e3d7beb78d47c706531ae100f2b62f': Import revised translations. DO NOT MERGE
| * | am 7ce3ba55: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-11-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit '7ce3ba55b65ec533328bf21f43ceaf16be21f2d4' into eclair-mr2 * commit '7ce3ba55b65ec533328bf21f43ceaf16be21f2d4': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-11-1220-10/+69
| | | | | | | | | | | | Approver: jerryw
* | | am 54ad5ee9: am 3a032856: Fix http://b/2248037 .Daniel Sandler2009-11-111-2/+7
|\| | | | | | | | | | | | | | | | | | | | Merge commit '54ad5ee90fdfa29debd08fbbed27fa3f67abc77e' * commit '54ad5ee90fdfa29debd08fbbed27fa3f67abc77e': Fix http://b/2248037 .
| * | am 3a032856: Fix http://b/2248037 .Daniel Sandler2009-11-111-2/+7
| |\| | | | | | | | | | | | | | | | | | | Merge commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b' into eclair-mr2 * commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b': Fix http://b/2248037 .
| | * Fix http://b/2248037 .Daniel Sandler2009-11-111-2/+7
| | | | | | | | | | | | | | | If there's no author information, just show the title in the picker list.
* | | am 510c489a: am d4e57d4c: Related work on issue #2170897.Dianne Hackborn2009-11-101-0/+20
|\| | | | | | | | | | | | | | | | | | | | Merge commit '510c489a081dae49f86033ecbf1b6e866c69656c' * commit '510c489a081dae49f86033ecbf1b6e866c69656c': Related work on issue #2170897.
| * | am d4e57d4c: Related work on issue #2170897.Dianne Hackborn2009-11-101-0/+20
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'd4e57d4cb45c0c7db605420dccd9fd4db854e998' into eclair-mr2 * commit 'd4e57d4cb45c0c7db605420dccd9fd4db854e998': Related work on issue #2170897.
| | * Related work on issue #2170897.Dianne Hackborn2009-11-101-0/+20
| | | | | | | | | | | | The wallpaper preview now delivers touch events to the wallpaper.
* | | am a888740c: am c1664042: Update wallpaper picker to new APIMarco Nelissen2009-11-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'a888740c5a7325f98e282fdabccc154c93f2daae' * commit 'a888740c5a7325f98e282fdabccc154c93f2daae': Update wallpaper picker to new API
| * | am c1664042: Update wallpaper picker to new APIMarco Nelissen2009-11-091-0/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'c1664042a632eb25f68487eb54ca8310be90da65' into eclair-mr2 * commit 'c1664042a632eb25f68487eb54ca8310be90da65': Update wallpaper picker to new API
| | * Update wallpaper picker to new APIMarco Nelissen2009-11-091-0/+1
| | |
* | | am bc1a898d: am 90e5569f: Improve live wallpaper picker: animations, loading ↵Romain Guy2009-11-096-6/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | message, etc. Merge commit 'bc1a898dfb0138733efe835ae95528699af8a6af' * commit 'bc1a898dfb0138733efe835ae95528699af8a6af': Improve live wallpaper picker: animations, loading message, etc.
| * | am 90e5569f: Improve live wallpaper picker: animations, loading message, etc.Romain Guy2009-11-096-6/+74
| |\| | | | | | | | | | | | | | | | | | | Merge commit '90e5569f45c3acda115ac5128248e0911ceaabcf' into eclair-mr2 * commit '90e5569f45c3acda115ac5128248e0911ceaabcf': Improve live wallpaper picker: animations, loading message, etc.
| | * Improve live wallpaper picker: animations, loading message, etc.Romain Guy2009-11-096-6/+74
| | |
* | | am 0f88b598: am 860eccdf: Fix bug where the preview wasn\'t starting because ↵Romain Guy2009-11-091-8/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | using an unknown window token. Merge commit '0f88b598f4dbfa8cd90db78aff555b35e440b0cd' * commit '0f88b598f4dbfa8cd90db78aff555b35e440b0cd': Fix bug where the preview wasn't starting because using an unknown window token.
| * | am 860eccdf: Fix bug where the preview wasn\'t starting because using an ↵Romain Guy2009-11-091-8/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | unknown window token. Merge commit '860eccdfd57bc0bc762f3e45147dafc1dfdbb915' into eclair-mr2 * commit '860eccdfd57bc0bc762f3e45147dafc1dfdbb915': Fix bug where the preview wasn't starting because using an unknown window token.
| | * Fix bug where the preview wasn't starting because using an unknown window token.Romain Guy2009-11-081-8/+16
| | |
* | | am 573abdf4: am 8cfd0d28: Sort live wallpapers alphabetically and UI tweaks.Romain Guy2009-11-092-0/+17
|\| | | | | | | | | | | | | | | | | | | | Merge commit '573abdf4e21c40cca2320b939fd50e37a81f032c' * commit '573abdf4e21c40cca2320b939fd50e37a81f032c': Sort live wallpapers alphabetically and UI tweaks.
| * | am 8cfd0d28: Sort live wallpapers alphabetically and UI tweaks.Romain Guy2009-11-092-0/+17
| |\| | | | | | | | | | | | | | | | | | | Merge commit '8cfd0d28d1cb57c98f83ad5da8cc77dbaca5914e' into eclair-mr2 * commit '8cfd0d28d1cb57c98f83ad5da8cc77dbaca5914e': Sort live wallpapers alphabetically and UI tweaks.
| | * Sort live wallpapers alphabetically and UI tweaks.Romain Guy2009-11-082-0/+17
| | | | | | | | | | | | | | | Previously the order of the live wallpapers could change every time the user opened the live wallpaper picker. Not cool.
* | | am a465d422: am 2f26cced: New, safer, live wallpaper picker.Romain Guy2009-11-0912-543/+631
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'a465d422cdb6f72c40f3e773261e0e6b2d69c773' * commit 'a465d422cdb6f72c40f3e773261e0e6b2d69c773': New, safer, live wallpaper picker.
| * | am 2f26cced: New, safer, live wallpaper picker.Romain Guy2009-11-0912-543/+631
| |\| | | | | | | | | | | | | | | | | | | Merge commit '2f26cced2d4257c4fb106939447d901ae971b4d1' into eclair-mr2 * commit '2f26cced2d4257c4fb106939447d901ae971b4d1': New, safer, live wallpaper picker.
| | * New, safer, live wallpaper picker.Romain Guy2009-11-0812-543/+631
| | |
* | | am 2d916bae: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-11-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '2d916baea40a432b2f8c55f791cab090d2f739bf' * commit '2d916baea40a432b2f8c55f791cab090d2f739bf': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2009-11-0620-0/+484
| | |
* | | am d4c615ef: am 7e2a10d9: Revised live wallpaper picker metadata display.Daniel Sandler2009-11-055-122/+55
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'd4c615efc60013a75bb291658f40f1b9d24fdfa2' * commit 'd4c615efc60013a75bb291658f40f1b9d24fdfa2': Revised live wallpaper picker metadata display.
| * | am 7e2a10d9: Revised live wallpaper picker metadata display.Daniel Sandler2009-11-055-122/+55
| |\| | | | | | | | | | | | | | | | | | | Merge commit '7e2a10d904ce52bde6e887b9c257709729f39613' into eclair-mr2 * commit '7e2a10d904ce52bde6e887b9c257709729f39613': Revised live wallpaper picker metadata display.
| | * Revised live wallpaper picker metadata display.Daniel Sandler2009-11-055-122/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the small BubbleView at the bottom with a block of music-video-style text, showing: Title Author Description Other minor changes to match final UI specification. Part of the fix for http://b/2235307 .
* | | am 781ef425: am df807b99: Fix live wallpaper picker crash on launch.Daniel Sandler2009-11-041-47/+0
|\| | | | | | | | | | | | | | | | | | | | Merge commit '781ef4258c69c767e6ee49172ab0034310016009' * commit '781ef4258c69c767e6ee49172ab0034310016009': Fix live wallpaper picker crash on launch.
| * | am df807b99: Fix live wallpaper picker crash on launch.Daniel Sandler2009-11-041-47/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'df807b99f41a1fe3237c13e52fd36482df4eb92b' into eclair-mr2 * commit 'df807b99f41a1fe3237c13e52fd36482df4eb92b': Fix live wallpaper picker crash on launch.
| | * Fix live wallpaper picker crash on launch.Daniel Sandler2009-11-041-47/+0
| | |
* | | am 155e7999: am 02d03b02: Do not allow the selection of the live wallpaper ↵Romain Guy2009-11-034-27/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | title. Merge commit '155e79991c7f52efa15e456628a17c21c0738fb5' * commit '155e79991c7f52efa15e456628a17c21c0738fb5': Do not allow the selection of the live wallpaper title.
| * | am 02d03b02: Do not allow the selection of the live wallpaper title.Romain Guy2009-11-034-27/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit '02d03b0212e69dc08814b6f81e3bd3d819316013' into eclair-mr2 * commit '02d03b0212e69dc08814b6f81e3bd3d819316013': Do not allow the selection of the live wallpaper title.
| | * Do not allow the selection of the live wallpaper title.Romain Guy2009-11-034-27/+0
| | |
* | | am 53c31c2a: (-s ours) am 520ad021: (-s ours) Import revised translations. ↵Eric Fischer2009-11-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '53c31c2a72b3d5387719709b36b29862d32ef049' * commit '53c31c2a72b3d5387719709b36b29862d32ef049': Import revised translations. DO NOT MERGE
| * | am 520ad021: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit '520ad02138b82b8fe45d205cbaa4778e0f297a9e' into eclair-mr2 * commit '520ad02138b82b8fe45d205cbaa4778e0f297a9e': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-10-3018-72/+36
| | |
* | | am 4ff2af0c: am d7967c59: Improving Live Wallpaper picker UI.Daniel Sandler2009-10-297-0/+247
|\| | | | | | | | | | | | | | | | | | | | Merge commit '4ff2af0c07476f17d255481d0d23b81041e7f575' * commit '4ff2af0c07476f17d255481d0d23b81041e7f575': Improving Live Wallpaper picker UI.
| * | am d7967c59: Improving Live Wallpaper picker UI.Daniel Sandler2009-10-297-0/+247
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'd7967c599e0d5b9ddb992b5f9836582d402a8671' into eclair-mr2 * commit 'd7967c599e0d5b9ddb992b5f9836582d402a8671': Improving Live Wallpaper picker UI.
| | * Improving Live Wallpaper picker UI.Daniel Sandler2009-10-297-0/+247
| | | | | | | | | | | | | | | The currently selected wallpaper's title is now shown in a Launcher-style bubble above the thumbnail gallery.
* | | am 7f9c12c5: (-s ours) am 6a354ff3: (-s ours) Import revised translations. ↵Eric Fischer2009-10-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '7f9c12c59a47f39e3aa00273920414f73edcb952' * commit '7f9c12c59a47f39e3aa00273920414f73edcb952': Import revised translations. DO NOT MERGE
| * | am 6a354ff3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit '6a354ff374529755d9c22d884095d61134fd7cd6' into eclair-mr2 * commit '6a354ff374529755d9c22d884095d61134fd7cd6': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-10-283-15/+9
| | |