888930cb1e
merge in ics-release history after reset to master
2011-09-22 07:00:31 -07:00
4080b68c4e
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-22 06:29:07 -07:00
1f74ff7eba
Should be updating voice icon as well on search packages changed. (Bug: 5352338)
...
Change-Id: I5a30e56b871556027d50e442e3f385b1a29a2850
2011-09-21 19:24:26 -07:00
b4563abcea
am 5944c3f0: am 12b6dc00: Merge "Use American spelling." into ics-factoryrom
...
* commit '5944c3f0427e077f214ffa8b0193e430aeef9b68':
Use American spelling.
2011-09-21 13:51:51 -07:00
356854dee0
am 06ce0123: am 7a8c6545: Merge "Tweaking clings in response to usability testing. (5057945, 5056643)" into ics-factoryrom
...
* commit '06ce0123201182ace64f136778ce9e38d78ab444':
Tweaking clings in response to usability testing. (5057945, 5056643)
2011-09-21 13:51:50 -07:00
5944c3f042
am 12b6dc00: Merge "Use American spelling." into ics-factoryrom
...
* commit '12b6dc0063409015827938c54237beb2700b6cad':
Use American spelling.
2011-09-21 13:50:45 -07:00
06ce012320
am 7a8c6545: Merge "Tweaking clings in response to usability testing. (5057945, 5056643)" into ics-factoryrom
...
* commit '7a8c654564a946a513982c497d71dca1bfbb8579':
Tweaking clings in response to usability testing. (5057945, 5056643)
2011-09-21 13:50:44 -07:00
12b6dc0063
Merge "Use American spelling." into ics-factoryrom
2011-09-21 13:49:35 -07:00
7a8c654564
Merge "Tweaking clings in response to usability testing. (5057945, 5056643)" into ics-factoryrom
2011-09-21 13:49:16 -07:00
cc1dc183f7
am 9bd02bdb: am d71fc27f: Reordering default workspace folder.
...
* commit '9bd02bdbd0f90f33cf98e18bfb12618e101c001e':
Reordering default workspace folder.
2011-09-21 10:34:47 -07:00
9bd02bdbd0
am d71fc27f: Reordering default workspace folder.
...
* commit 'd71fc27fef96880461f4a357d382f81bed3f3384':
Reordering default workspace folder.
2011-09-21 10:32:25 -07:00
01bd4f8748
merge in ics-release history after reset to master
2011-09-21 07:00:44 -07:00
acd7fb6ed9
Use American spelling.
...
Bug: 5351455
Change-Id: I039b7485663be126dd0fcc3cf57226d415c1cb8f
2011-09-21 09:45:39 -04:00
faf867df09
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-21 06:30:09 -07:00
d68b5c696f
am b062b0a8: Reconcile with ics-factoryrom-release
...
* commit 'b062b0a860b7b94d5e2764c7a43b663ded30db45':
2011-09-21 06:23:10 -07:00
b062b0a860
Reconcile with ics-factoryrom-release
...
Change-Id: Ibaa16006bb0ba1c7e483a3048866a1a0050d2bbc
2011-09-21 06:19:33 -07:00
2d6765a510
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 20:43:06 -07:00
d71fc27fef
Reordering default workspace folder.
...
Change-Id: I2fb836aa8bee6b7e43d94bd7c056be6524b145f6
2011-09-20 17:52:13 -07:00
7a74ac9cd6
Tweaking clings in response to usability testing. (5057945, 5056643)
...
- Updating assets
- Removing folder cling text
- Fading in folder cling after folder animation
- Highlighting different icon in allapps cling
Change-Id: I6e4fadf10b81a91296304f008644ee1d154ec5f8
2011-09-20 17:51:10 -07:00
7cc13d06fd
am 087cf483: (-s ours) am 53c67ee6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit '087cf483c009e92f548906cf7529345ceb86503a':
Import revised translations. DO NOT MERGE
2011-09-20 16:26:01 -07:00
83ca6b4664
am 6d041a5d: am 0391096c: Merge "Launcher tweaks." into ics-factoryrom
...
* commit '6d041a5d90f6fb7c3d8bf35becfbd96ba685b728':
Launcher tweaks.
2011-09-20 16:25:36 -07:00
d4c3bc27cc
am 90b1f15f: am 7f0acdde: Deferring create hardware layers until we load widget pages. (5330412)
...
* commit '90b1f15fd59b07d9cb37f2ad006f569cc2ef9ba4':
Deferring create hardware layers until we load widget pages. (5330412)
2011-09-20 16:24:41 -07:00
087cf483c0
am 53c67ee6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit '53c67ee6cbd08c2afa313e7f0d25a5a3e1129c8e':
Import revised translations. DO NOT MERGE
2011-09-20 15:40:45 -07:00
53c67ee6cb
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-20 15:36:57 -07:00
f08c420e80
Import revised translations. DO NOT MERGE
...
Change-Id: I04a88a7896828ba31340f56641a2d173b1736634
2011-09-20 15:22:42 -07:00
6d041a5d90
am 0391096c: Merge "Launcher tweaks." into ics-factoryrom
...
* commit '0391096cc64fe424544e4a19f4e1ffa092251af1':
Launcher tweaks.
2011-09-20 14:53:57 -07:00
0391096cc6
Merge "Launcher tweaks." into ics-factoryrom
2011-09-20 14:51:20 -07:00
7cc26cb840
am dd12b66a: Merge "Import revised translations."
...
* commit 'dd12b66a9b40ea0f910f38b1a8b5469de98f5d8e':
Import revised translations.
2011-09-20 14:16:07 -07:00
9c546c6e80
am 3dcb459b: Reconcile with ics-factoryrom-release
...
* commit '3dcb459b1ba9d02c4be81c0712b4310eb48bd884':
2011-09-20 14:14:44 -07:00
90b1f15fd5
am 7f0acdde: Deferring create hardware layers until we load widget pages. (5330412)
...
* commit '7f0acdde9679eb545abb8bc5373e1938c420bf63':
Deferring create hardware layers until we load widget pages. (5330412)
2011-09-20 14:13:49 -07:00
dd12b66a9b
Merge "Import revised translations."
2011-09-20 10:57:03 -07:00
5b93aec4db
Import revised translations.
...
Change-Id: Ib1865d679cfe68b824b2728cfc558affae26ab97
2011-09-20 10:30:50 -07:00
3dcb459b1b
Reconcile with ics-factoryrom-release
...
Change-Id: I90b269fd21b390eae70d5b037bc0d2e243f8bea1
2011-09-20 07:43:26 -07:00
2ca5cf8bc5
merge in ics-release history after reset to master
2011-09-20 07:00:56 -07:00
cf55d5dc6a
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 06:28:35 -07:00
7f0acdde96
Deferring create hardware layers until we load widget pages. (5330412)
...
Change-Id: Ia1b5e3ec3db7b7de4b0a76486136ba9df07ff70f
2011-09-19 18:36:48 -07:00
9d9d74f2b0
Launcher tweaks.
...
- Updating search bar bg
- Removing clings from the layout if they are already dismissed
- Tweaking cling description paddings for languages that are more verbase
- Tweaking wallpaper picker gallery spacing
Change-Id: I801cdf4b1d0cc49a53113318d7b9075f6fa218bd
2011-09-19 16:06:37 -07:00
7370a15917
am 8ded9eac: am ff648b55: Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
...
* commit '8ded9eac3f02eb1e6044fc36c23a8f7c6356fd5d':
Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
2011-09-19 13:07:57 -07:00
8ded9eac3f
am ff648b55: Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
...
* commit 'ff648b5512d1af9f5863aa97677a7a3e108ad1dd':
Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
2011-09-19 13:05:53 -07:00
ff648b5512
Issue 5218087, HONEYCOMB_MR2 -> ICE_CREAM_SANDWICH for widget padding
...
-> Also moved a couple dimens to be consistent
Change-Id: I897e1fc0706b8dcc6f6c1efe719c97b6a3932407
2011-09-19 11:59:13 -07:00
cd4a55670e
am a279f5c2: am 18428a79: Merge "Updating Clings. (5057945, 5056643)" into ics-factoryrom
...
* commit 'a279f5c2b0c30cd7b0d3e574794fcfd1667531f0':
Updating Clings. (5057945, 5056643)
2011-09-19 11:51:15 -07:00
a279f5c2b0
am 18428a79: Merge "Updating Clings. (5057945, 5056643)" into ics-factoryrom
...
* commit '18428a79810761e68d93eeb33d6032d84abdd25a':
Updating Clings. (5057945, 5056643)
2011-09-19 11:48:03 -07:00
18428a7981
Merge "Updating Clings. (5057945, 5056643)" into ics-factoryrom
2011-09-19 11:45:52 -07:00
6176dafb40
am e33f810a: Reconcile with ics-factoryrom-release
...
* commit 'e33f810a19d5db5b5c5a67eceeb12a5bc1a51b09':
2011-09-19 09:44:50 -07:00
6916f1718a
am 034be6b2: am e5d77260: Tweaking search bar padding a little more. (5051804)
...
* commit '034be6b2620aee0ca98fa98007d5b5dc5a4e4b13':
Tweaking search bar padding a little more. (5051804)
2011-09-19 09:44:21 -07:00
e33f810a19
Reconcile with ics-factoryrom-release
...
Change-Id: I494a93ba774ff98969c412d4a9f07f21ef683cde
2011-09-19 08:00:56 -07:00
9268bb6b8e
merge in ics-release history after reset to master
2011-09-19 07:00:32 -07:00
cda1f1c0d6
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-19 06:28:26 -07:00
034be6b262
am e5d77260: Tweaking search bar padding a little more. (5051804)
...
* commit 'e5d772603be1187fd2467c273ffc82f142c2cd2c':
Tweaking search bar padding a little more. (5051804)
2011-09-18 19:39:34 -07:00
7d7541e7b4
Updating Clings. (5057945, 5056643)
...
Change-Id: Ifb2d37e92495aeddf9d4b3277eb8d2a846f4aa99
2011-09-18 18:38:11 -07:00
The Android Automerger
Winson Chung
Daniel Sandler
The Android Open Source Project
Eric Fischer
Adam Cohen