summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add an original-package tag that matches the real package name.Jeff Hamilton2010-02-121-0/+2
| | | | Change-Id: I48ca7999e19e703208092e6a6f80b0b67faa1757
* am 20c7cfb3: am e5a8ce6f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit '20c7cfb334124a537c281c32cc8a13ec37d5957c' * commit '20c7cfb334124a537c281c32cc8a13ec37d5957c': android-2.1_r1 snapshot
| * am e5a8ce6f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'e5a8ce6f767a05dae004b1aab912fa681aca685a' into eclair-plus-aosp * commit 'e5a8ce6f767a05dae004b1aab912fa681aca685a': android-2.1_r1 snapshot
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | | |\
| | | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-1239-0/+1688
| | | | |
* | | | | am af6154f5: am ebd8b7dd: Fix issue #2395667: Pull LW Picker apk from Droid ↵Dianne Hackborn2010-01-281-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build Merge commit 'af6154f52bb590f20f3700e1635776a76b805891' * commit 'af6154f52bb590f20f3700e1635776a76b805891': Fix issue #2395667: Pull LW Picker apk from Droid build
| * | | | am ebd8b7dd: Fix issue #2395667: Pull LW Picker apk from Droid buildDianne Hackborn2010-01-251-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ebd8b7dd77b015e10b7ed3a45ba6903e48127d48' into eclair-plus-aosp * commit 'ebd8b7dd77b015e10b7ed3a45ba6903e48127d48': Fix issue #2395667: Pull LW Picker apk from Droid build
| | * | | Fix issue #2395667: Pull LW Picker apk from Droid buildDianne Hackborn2010-01-251-3/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | My tricky stuff to add the live wallpaper feature if the live wallpaper picker is included in the system was too tricky for me, and doesn't work. It just always got added. Remove this for now, requiring that products explicitly include this feature definition.
* | | | am 4a63d677: merge from open-source masterThe Android Open Source Project2010-01-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4a63d67799150204928d84e94c790c3836afbed5' * commit '4a63d67799150204928d84e94c790c3836afbed5': empty initial commit
| * | | merge from open-source masterThe Android Open Source Project2010-01-210-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * empty initial commitThe Android Open Source Project2010-01-110-0/+0
| |
* | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-084-12/+12
| | | | | | | | Bug: #2361749.
* | Update with latest translations.Eric Fischer2010-01-0720-0/+544
| |
* | explicit set an "optional" tagJean-Baptiste Queru2010-01-051-1/+1
| |
* | The wallpaper picker should not try to run in acore.Dianne Hackborn2009-12-161-1/+0
| | | | | | | | | | | | It can't, because it isn't using the sharedUserId for it. So what this ended up doing was creating another acore under this app's uid, which confused me for a long time.
* | am 72f1df4e: (-s ours) am bec21816: (-s ours) Import revised translations. ↵Eric Fischer2009-12-100-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit '72f1df4ef488a352fc3757f7f412444c6d129910' * commit '72f1df4ef488a352fc3757f7f412444c6d129910': Import revised translations. DO NOT MERGE
| * | am bec21816: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-12-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'bec218167e80177e9f026cda83b86916a0d2e641' into eclair-mr2 * commit 'bec218167e80177e9f026cda83b86916a0d2e641': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-12-0920-40/+44
| | |
* | | am 86a4c286: am 309c5a81: Clean up label for live wallpapers.Daniel Sandler2009-12-101-2/+2
|\| | | | | | | | | | | | | | | | | | | | Merge commit '86a4c2862d4147326982ed71d3e8a288ed837db6' * commit '86a4c2862d4147326982ed71d3e8a288ed837db6': Clean up label for live wallpapers.
| * | am 309c5a81: Clean up label for live wallpapers.Daniel Sandler2009-12-021-2/+2
| |\| | | | | | | | | | | | | | | | | | | Merge commit '309c5a81a3e45cb202acabc1059145f2203daa77' into eclair-mr2 * commit '309c5a81a3e45cb202acabc1059145f2203daa77': Clean up label for live wallpapers.
| | * Clean up label for live wallpapers.Daniel Sandler2009-12-021-2/+2
| | | | | | | | | | | | http://b/2261747
* | | am ed5ffc05: (-s ours) am d07eed07: (-s ours) Import revised translations. ↵Eric Fischer2009-12-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Merge commit 'ed5ffc05dc2af87e50d86bac9fe49e76bcefcdb8' * commit 'ed5ffc05dc2af87e50d86bac9fe49e76bcefcdb8': Import revised translations. DO NOT MERGE
| * | am d07eed07: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-12-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'd07eed073c74895db8246a5307cc66332233520f' into eclair-mr2 * commit 'd07eed073c74895db8246a5307cc66332233520f': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-11-301-3/+3
| | |
* | | am 2b8b76db: am 4854f732: Merge change I05350395 into eclairDaniel Sandler2009-11-201-2/+7
|\| | | | | | | | | | | | | | | | | | | | Merge commit '2b8b76db2b2e8ca1fd613af6d10d4cdf79cb9174' * commit '2b8b76db2b2e8ca1fd613af6d10d4cdf79cb9174': Fix http://b/2248037 (crash in LW picker).
| * | am 4854f732: Merge change I05350395 into eclairDaniel Sandler2009-11-201-2/+7
| |\| | | | | | | | | | | | | | | | | | | Merge commit '4854f73200dcb1870ff66c64b480602269b58764' into eclair-mr2 * commit '4854f73200dcb1870ff66c64b480602269b58764': Fix http://b/2248037 (crash in LW picker).
| | * Merge change I05350395 into eclairAndroid (Google) Code Review2009-11-201-2/+7
| | |\ | | | | | | | | | | | | | | | | * changes: Fix http://b/2248037 (crash in LW picker).
| | | * Fix http://b/2248037 (crash in LW picker).Daniel Sandler2009-11-191-2/+7
| | | |
* | | | am 33f09068: am ff1c3128: Finish issue #2271640: Fix wallpaper etc docsDianne Hackborn2009-11-192-0/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '33f09068720749f90dde029d6d17885d6a16994c' * commit '33f09068720749f90dde029d6d17885d6a16994c': Finish issue #2271640: Fix wallpaper etc docs
| * | | am ff1c3128: Finish issue #2271640: Fix wallpaper etc docsDianne Hackborn2009-11-192-0/+43
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ff1c31282452dc87b1dbd1e4391216b080745135' into eclair-mr2 * commit 'ff1c31282452dc87b1dbd1e4391216b080745135': Finish issue #2271640: Fix wallpaper etc docs
| | * | Finish issue #2271640: Fix wallpaper etc docsDianne Hackborn2009-11-192-0/+43
| | |/ | | | | | | | | | Publish the live wallpaper feature if they are supported.
* | | am 26f3f828: am 0dffdc7e: Merge change Iead6e21b into eclairDaniel Sandler2009-11-183-16/+16
|\| | | | | | | | | | | | | | | | | | | | Merge commit '26f3f8285d6027f795b68967c37405c2a94f8ba5' * commit '26f3f8285d6027f795b68967c37405c2a94f8ba5': Clean up live wallpaper picker list.
| * | am 0dffdc7e: Merge change Iead6e21b into eclairDaniel Sandler2009-11-183-16/+16
| |\| | | | | | | | | | | | | | | | | | | Merge commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8' into eclair-mr2 * commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8': Clean up live wallpaper picker list.
| | * Merge change Iead6e21b into eclairAndroid (Google) Code Review2009-11-183-16/+16
| | |\ | | | | | | | | | | | | | | | | * changes: Clean up live wallpaper picker list.
| | | * Clean up live wallpaper picker list.Daniel Sandler2009-11-163-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author information is no longer shown (ultimately not meaningful information). LWs can add an attribution to their descriptions if necessary. Note that the preferred geometry of a LW thumbnail image is now square. (This allows for more descriptive text, and is also easier for the author to get right.) Bug: http://b/2261754
* | | | am 81a28157: am bc32f210: Merge change I88e7aada into eclairDaniel Sandler2009-11-175-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '81a281579c85bf2a3b64a643fc619c884f2ae38c' * commit '81a281579c85bf2a3b64a643fc619c884f2ae38c': New icons for live wallpaper picker.
| * | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 16:55:38 +0000