Claudia de Veaux
e52f6a5db1
am 466d009d: Merge "Edits to strings per UI text standards."
...
* commit '466d009d320354ea0e8b90703602dfb9d5da187f':
Edits to strings per UI text standards.
2011-12-12 15:28:34 -08:00
Claudia de Veaux
466d009d32
Merge "Edits to strings per UI text standards."
2011-12-12 15:27:02 -08:00
Michael Jurka
31c7b78662
am c02e3932: Merge "Reduce peak memory use in PagedView"
...
* commit 'c02e3932c382a1854ff39c5e2714d5c07c0a8bcd':
Reduce peak memory use in PagedView
2011-12-09 16:29:36 -08:00
Michael Jurka
c02e3932c3
Merge "Reduce peak memory use in PagedView"
2011-12-09 16:27:35 -08:00
Eric Fischer
23fe8b87a3
am 2d1654b0: am 692999a4: (-s ours) am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '2d1654b054eae4f08831f1c753c9ccc66a585980':
Import revised translations. DO NOT MERGE
2011-12-09 15:03:52 -08:00
The Android Open Source Project
089ad49fdd
am d9e771db: am 63bd76fb: Reconcile with ics-mr1-release
...
* commit 'd9e771db74ea09560132d5937433bbf1006b389a':
2011-12-09 15:03:51 -08:00
Eric Fischer
2d1654b054
am 692999a4: (-s ours) am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '692999a463aca8730fd5949448449dbe4d4403e9':
Import revised translations. DO NOT MERGE
2011-12-09 14:58:14 -08:00
The Android Open Source Project
d9e771db74
am 63bd76fb: Reconcile with ics-mr1-release
...
* commit '63bd76fbd689ed2f3a347d628fa939a605aed316':
2011-12-09 14:57:49 -08:00
Claudia de Veaux
7fb4bf582b
Edits to strings per UI text standards.
...
* Use "choose" rather than "select" when asking the user to make a choice of an option.
* Use "touch" rather than "tap"
* We're standardizing "Allow the app..." in permission descriptions
Bug: 5163232
Change-Id: Ie43459127c0c5036881685b85f4b599c0e5402ff
2011-12-09 11:34:44 -08:00
The Android Open Source Project
8130432516
Reconcile with ics-mr1-release
...
Change-Id: Icbfa322624551425fadedb6a41a3a4d339e6ff52
2011-12-09 07:11:38 -08:00
The Android Automerger
9f0acb9bcd
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 17:35:53 -08:00
Eric Fischer
692999a463
am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'f4e80c840944e81eae96426a995c26712f1b9780':
Import revised translations. DO NOT MERGE
2011-12-08 11:13:16 -08:00
Eric Fischer
f4e80c8409
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-08 11:09:35 -08:00
Eric Fischer
6ee8e41521
Import revised translations. DO NOT MERGE
...
Change-Id: I19b9e88f40d1929f7a30e3fbb5982bd7b7f25bde
2011-12-08 10:35:03 -08:00
The Android Open Source Project
63bd76fbd6
Reconcile with ics-mr1-release
...
Change-Id: I4b725ae1b482e0dd54d7646f24663c8492c2d049
2011-12-08 10:22:16 -08:00
The Android Automerger
55896d181c
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 07:01:06 -08:00
Winson Chung
dcabf4beb5
am 8df6db62: am 21376520: am 7bb005c6: Merge "Adding static wallpapers for crespo/tablet (Bug 5506089)" into ics-mr1
...
* commit '8df6db62fe11320468eab7624adfee27ad36a666':
Adding static wallpapers for crespo/tablet (Bug 5506089)
2011-12-07 17:38:20 -08:00
Winson Chung
8df6db62fe
am 21376520: am 7bb005c6: Merge "Adding static wallpapers for crespo/tablet (Bug 5506089)" into ics-mr1
...
* commit '21376520a974b2e71ca82bed868b6e19f612a790':
Adding static wallpapers for crespo/tablet (Bug 5506089)
2011-12-07 17:36:09 -08:00
Winson Chung
21376520a9
am 7bb005c6: Merge "Adding static wallpapers for crespo/tablet (Bug 5506089)" into ics-mr1
...
* commit '7bb005c6c80a81e5012a2cb9de702b498d6a9e2a':
Adding static wallpapers for crespo/tablet (Bug 5506089)
2011-12-07 17:34:30 -08:00
Winson Chung
7bb005c6c8
Merge "Adding static wallpapers for crespo/tablet (Bug 5506089)" into ics-mr1
2011-12-07 17:33:18 -08:00
Michael Jurka
5331d77729
am 475655ea: Merge "Scaling PagedView fling constants by density (issue 5594666)"
...
* commit '475655ea5900df19bbf31a9b2f7bd99dbeeef1a9':
Scaling PagedView fling constants by density (issue 5594666)
2011-12-07 16:25:21 -08:00
Michael Jurka
475655ea59
Merge "Scaling PagedView fling constants by density (issue 5594666)"
2011-12-07 16:23:28 -08:00
Adam Cohen
265b9a6654
Scaling PagedView fling constants by density (issue 5594666)
...
Change-Id: I3f37b820fb9864091a02a51b354f10f9a0fa2ac7
2011-12-07 14:37:18 -08:00
Winson Chung
d6843b2075
Adding static wallpapers for crespo/tablet (Bug 5506089)
...
Change-Id: I7f56b046cf02c198def811e0113688d93008785a
2011-12-07 14:25:29 -08:00
Adam Cohen
1aa908b076
am 90f53da6: am b4848296: am c00f0b99: No longer using fastInvalidate() pattern for half of AllApps transition
...
* commit '90f53da6809bd97f48551c066ee404b0f75079b4':
No longer using fastInvalidate() pattern for half of AllApps transition
2011-12-06 23:13:25 -08:00
Adam Cohen
90f53da680
am b4848296: am c00f0b99: No longer using fastInvalidate() pattern for half of AllApps transition
...
* commit 'b4848296880a351b40b1f01a0bb675e7e9c6ee52':
No longer using fastInvalidate() pattern for half of AllApps transition
2011-12-06 23:11:55 -08:00
Adam Cohen
b484829688
am c00f0b99: No longer using fastInvalidate() pattern for half of AllApps transition
...
* commit 'c00f0b996712243e0745ea1af870b0229ca11a73':
No longer using fastInvalidate() pattern for half of AllApps transition
2011-12-06 23:09:56 -08:00
Adam Cohen
c00f0b9967
No longer using fastInvalidate() pattern for half of AllApps transition
...
Turns out this was likely causing the hardware layer to be redrawn and hence
an anti-optimization
Change-Id: Ib98beebec6efed339eb9f918c24579af529e028e
2011-12-06 19:54:37 -08:00
Michael Jurka
0cad1116ad
Reduce peak memory use in PagedView
2011-12-06 18:42:41 -08:00
The Android Open Source Project
39386b97c7
am afae108e: Reconcile with ics-mr1-release
...
* commit 'afae108e09c13c557beee12440cea6345bff924f':
2011-12-02 07:56:59 -08:00
The Android Open Source Project
afae108e09
Reconcile with ics-mr1-release
...
Change-Id: I4b78781b7fc2d280e633586f53572e639fc7cd90
2011-12-02 07:53:37 -08:00
Adam Cohen
d2cb2b51af
am 23a4d305: Adding system property to force enable launcher rotation
...
* commit '23a4d305ab6453106a2f8db413414701b1064d28':
Adding system property to force enable launcher rotation
2011-12-01 17:41:13 -08:00
Adam Cohen
23a4d305ab
Adding system property to force enable launcher rotation
...
Change-Id: If855a84a37716b86a84bf571c15c5ee715ff1845
2011-12-01 17:26:44 -08:00
The Android Automerger
e09baf3ebb
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 16:46:17 -08:00
Daniel Sandler
936ee02373
am fc3b8649: am 72aff731: (-s ours) am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
...
* commit 'fc3b864931e77a91e676fad55dbf1dfef5959afd':
Remove dependency on support library. DO NOT MERGE.
2011-12-01 12:44:33 -08:00
Daniel Sandler
fc3b864931
am 72aff731: (-s ours) am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
...
* commit '72aff731f0640ac6293b1ba73b6e4a5c37a2f864':
Remove dependency on support library. DO NOT MERGE.
2011-12-01 12:41:58 -08:00
Daniel Sandler
72aff731f0
am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
...
* commit '65604f1668304ee7718459990206bd1783014771':
Remove dependency on support library. DO NOT MERGE.
2011-12-01 12:34:06 -08:00
Daniel Sandler
65604f1668
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
2011-12-01 12:31:52 -08:00
Winson Chung
0facc250f2
am 797d8ff4: am 2ddae956: am 1f73d893: Merge "Updating AllApps button asset." into ics-mr1
...
* commit '797d8ff41429a40e616014514f047c34ef78db2c':
Updating AllApps button asset.
2011-12-01 12:01:23 -08:00
Winson Chung
4193c65dba
am a5ca30c8: am 125bd213: am 52d89c39: Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1
...
* commit 'a5ca30c885e931acbf523ae611b130c8a5ef7e65':
Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait.
2011-12-01 12:01:22 -08:00
Winson Chung
797d8ff414
am 2ddae956: am 1f73d893: Merge "Updating AllApps button asset." into ics-mr1
...
* commit '2ddae9567430d441ece92b3f7bfd9f83e83519ae':
Updating AllApps button asset.
2011-12-01 11:59:10 -08:00
Winson Chung
a5ca30c885
am 125bd213: am 52d89c39: Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1
...
* commit '125bd2134eaa42bc8887317fb9dd43c3f20a3c92':
Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait.
2011-12-01 11:59:09 -08:00
Winson Chung
2ddae95674
am 1f73d893: Merge "Updating AllApps button asset." into ics-mr1
...
* commit '1f73d8939aa28d7ea79845c8e41941c5f4ab18fd':
Updating AllApps button asset.
2011-12-01 11:19:43 -08:00
Winson Chung
125bd2134e
am 52d89c39: Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1
...
* commit '52d89c3908f26c867b6cbd3f6a84992a21aa30a6':
Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait.
2011-12-01 11:19:43 -08:00
Winson Chung
1f73d8939a
Merge "Updating AllApps button asset." into ics-mr1
2011-12-01 10:56:02 -08:00
Winson Chung
52d89c3908
Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1
2011-12-01 10:55:56 -08:00
Daniel Sandler
332ffed2df
Remove dependency on support library. DO NOT MERGE.
...
Bug: 5689684
Change-Id: I57c662da9b2c2009ee1631e637e5f55deea021b7
2011-12-01 12:19:52 -05:00
The Android Automerger
6a7dbc646c
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 06:46:42 -08:00
Michael Jurka
ebce7c66e3
am 9aca7a0f: am 313c8370: am 05bf644e: Fix memory leak in Launcher
...
* commit '9aca7a0f74998bd93074fc97040c7800181344b1':
Fix memory leak in Launcher
2011-11-30 21:15:10 -08:00
Michael Jurka
9aca7a0f74
am 313c8370: am 05bf644e: Fix memory leak in Launcher
...
* commit '313c8370315fffbf8fc3593bb8dd4cf77a7ce346':
Fix memory leak in Launcher
2011-11-30 21:13:04 -08:00