17c117f7a8
am 9fea43e9: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '9fea43e972e992964313377c3392d6c0fd762a44':
2012-09-26 10:07:54 -07:00
9fea43e972
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ic10126a26c648cbf7402c5e699ec4aea7240fe6e
2012-09-26 09:08:12 -07:00
b0db60d638
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-26 07:00:08 -07:00
63e302a8c4
am e792db3f: am 37990b4b: Fix # 6925851: Workspace page spacing gets messed up
...
* commit 'e792db3ff624ad4d875a7ec25c949c1d1b0b6bbb':
Fix # 6925851: Workspace page spacing gets messed up
2012-09-25 15:48:55 -07:00
e792db3ff6
am 37990b4b: Fix # 6925851: Workspace page spacing gets messed up
...
* commit '37990b4b4fc241fcf12a4b6d1725c69605b26605':
Fix # 6925851: Workspace page spacing gets messed up
2012-09-25 15:46:35 -07:00
2ef935e0a9
am e49139e3: am e19bbca9: Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
...
* commit 'e49139e3da79ca5624ef0cab14691fc81660f0e2':
7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest
2012-09-25 15:33:48 -07:00
37990b4b4f
Fix # 6925851: Workspace page spacing gets messed up
...
Change-Id: I694fa1e04049e35a415b1f1a85759e501fec6258
2012-09-25 15:14:30 -07:00
d4171e19bc
Merge "Import translations. DO NOT MERGE"
2012-09-25 13:58:18 -07:00
e49139e3da
am e19bbca9: Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
...
* commit 'e19bbca93eb93d4daaf31ac3e7bd8e4c32838af4':
7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest
2012-09-25 13:49:46 -07:00
e19bbca93e
Merge "7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest" into jb-mr1-dev
2012-09-25 13:47:37 -07:00
a9b289b8e2
am b17fca85: am aee3a0ef: Remove action bar from wallpaper picker
...
* commit 'b17fca8594297915c58eaddc40773128254ad250':
Remove action bar from wallpaper picker
2012-09-25 13:30:10 -07:00
369dd0c3e6
7225161 Launcher needs to add android:supportsRtl="true" in his AndroidManifest
...
- add basic RTL support in the AndroidManifest so that Widgets will be able
to support RTL too
- force LTR layout direction to AppsCustomizeTabHost so that we dont have to
deal with layout mirroring yet
(do not need to force also LTR layout direction to Wallpaper activity and fragment
as another CL is removing the ActionBar on them)
Change-Id: I66623a3fcec0d7adef62b0ab8c8b2170e09f1b1b
2012-09-25 12:55:37 -07:00
b17fca8594
am aee3a0ef: Remove action bar from wallpaper picker
...
* commit 'aee3a0ef78793bb8d3fd48e2c5faa27d895cf9a9':
Remove action bar from wallpaper picker
2012-09-25 12:32:34 -07:00
3fb1662676
Import translations. DO NOT MERGE
...
Change-Id: I7769d9f8e35e0a452b3dd55c75b92118ef07544f
Auto-generated-cl: translation import
2012-09-25 11:51:49 -07:00
aee3a0ef78
Remove action bar from wallpaper picker
...
Bug: 5295678
Change-Id: I50bb4bee3d9d54f28ef4a46ed9754701045d38c7
2012-09-25 11:36:39 -07:00
95a09e516e
am 6ba56c61: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '6ba56c61966e32eb34d5b749c2774459f8e71f15':
2012-09-24 10:15:01 -07:00
6ba56c6196
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4a8eedf65186e150638048de58ef12a0ffe6fc98
2012-09-24 10:13:17 -07:00
befe710322
am 7beccc08: am fa7969fb: Fix NPE
...
* commit '7beccc08e3a90afd0732a187ba48ea5daaa5f9bb':
Fix NPE
2012-09-24 00:52:05 -07:00
b3f27f30fc
am 26a16c24: am e5574e0b: Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev
...
* commit '26a16c24d72194c7a85b66cb4f90756ec4fb4597':
Try to fix RTE when updating shortcuts
2012-09-24 00:50:39 -07:00
23a465305a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:42:35 -07:00
7beccc08e3
am fa7969fb: Fix NPE
...
* commit 'fa7969fbd587d8eb2e43093a83fcad85e2b91726':
Fix NPE
2012-09-21 17:08:38 -07:00
fa7969fbd5
Fix NPE
...
Bug: 7024933
2012-09-21 16:39:14 -07:00
26a16c24d7
am e5574e0b: Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev
...
* commit 'e5574e0b7316890bcbce2465e632a04049b57769':
Try to fix RTE when updating shortcuts
2012-09-21 15:30:35 -07:00
e5574e0b73
Merge "Try to fix RTE when updating shortcuts" into jb-mr1-dev
2012-09-21 15:28:48 -07:00
b2ae8acc0c
Try to fix RTE when updating shortcuts
...
Bug: 6529398
Change-Id: Ib88eda5dc1eaf72aae161b25b080197b1049e824
2012-09-21 15:26:52 -07:00
609f99ee67
am 3501c173: am c4a9233a: Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev
...
* commit '3501c173e4e2f167f0a7336645526ef54799a8f2':
Remove "fade in" animation for search + voice search.
2012-09-21 12:47:02 -07:00
e62b4ef6ff
am a59a8b3d: am bdb1030e: Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
...
* commit 'a59a8b3d5c3e5e3d1760ab4c5e9dfa4ac5d135f7':
Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
2012-09-21 12:47:01 -07:00
3501c173e4
am c4a9233a: Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev
...
* commit 'c4a9233a94ef186baa8113ceb44b08c65725ed41':
Remove "fade in" animation for search + voice search.
2012-09-21 10:54:01 -07:00
a59a8b3d5c
am bdb1030e: Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
...
* commit 'bdb1030e215f163440b6f73f65b0ae47c5f6c8fd':
Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
2012-09-21 10:54:00 -07:00
c4a9233a94
Merge "Remove "fade in" animation for search + voice search." into jb-mr1-dev
2012-09-21 10:51:32 -07:00
95a556ac7a
Remove "fade in" animation for search + voice search.
...
This applies when the app is launched by tapping the
search box or the voice search icon.
bug:7193408
Change-Id: I29f41faa20c3e7ad00032f749c99d9b69402c422
2012-09-21 18:28:48 +01:00
bdb1030e21
Removing functionality to click under AllApps to return to the workspace. (Bug 7012020)
...
Change-Id: I69a4d28866d550cb4a43c99875e3e94dda1b0de8
2012-09-20 18:01:41 -07:00
4f395af9b2
am 3e78f477: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3e78f477c237e3ac9da58b698893b482c4baefa4':
2012-09-20 12:49:03 -07:00
3e78f477c2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If5926763f15cb33557ca2550360a205beb9a86f2
2012-09-20 10:36:42 -07:00
883462790b
am 374d3996: am 9e05a5ea: Making launcher use new widget binding APIs
...
* commit '374d39968a0b2516f75a9f2815b28f1de5ff4775':
Making launcher use new widget binding APIs
2012-09-20 09:29:15 -07:00
be3c59b806
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-20 07:00:23 -07:00
374d39968a
am 9e05a5ea: Making launcher use new widget binding APIs
...
* commit '9e05a5ea951b4d5ffce324da8dd0656353306e6f':
Making launcher use new widget binding APIs
2012-09-20 06:07:54 -07:00
9e05a5ea95
Making launcher use new widget binding APIs
...
Change-Id: I9cd6716e1dc0c53b5c846371ea109ced4cd3d40a
2012-09-19 15:22:23 -07:00
802f16a414
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:46 -07:00
cd871d8477
am a1e38957: am 671a3a22: Merge "Fixing some warnings" into jb-mr1-dev
...
* commit 'a1e3895791ffaff12b0462ba82df906156ce1ae8':
Fixing some warnings
2012-09-18 13:31:12 -07:00
a1e3895791
am 671a3a22: Merge "Fixing some warnings" into jb-mr1-dev
...
* commit '671a3a227c0ca880b0bf4ee93623efb61a4a6be5':
Fixing some warnings
2012-09-18 13:29:09 -07:00
671a3a227c
Merge "Fixing some warnings" into jb-mr1-dev
2012-09-18 13:26:18 -07:00
da1eae4ecf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-18 07:00:13 -07:00
8a82c9469a
am 57aecec5: am 1190487e: Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
...
* commit '57aecec5bb4856579ffa4066c100db702c96f2a8':
Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
2012-09-18 00:09:14 -07:00
57aecec5bb
am 1190487e: Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
...
* commit '1190487e15325e371c6c18181b1a5ef7ab2a79e6':
Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
2012-09-18 00:03:36 -07:00
82422503fd
Fixing some warnings
...
Change-Id: I28ff3b62b831bd49e3592c1b86ba978208324c11
2012-09-17 18:10:30 -07:00
1190487e15
Fixing issue where we were collating labels based on an old Locale. (Bug 7133873)
...
Change-Id: Ic1366f06020d1e405a6800386472a8832d683c5e
2012-09-17 16:59:21 -07:00
efb7fd59ba
am 0bc459bd: am 804503c7: Add user initialing receiver to select a unique wallpaper.
...
* commit '0bc459bdf3f5391bbac8d466a3d1c82a8d482704':
Add user initialing receiver to select a unique wallpaper.
2012-09-17 14:44:12 -07:00
c08ca67184
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 07:00:17 -07:00
0bc459bdf3
am 804503c7: Add user initialing receiver to select a unique wallpaper.
...
* commit '804503c75a12e1578f2f71ff3cb32ae912fc9451':
Add user initialing receiver to select a unique wallpaper.
2012-09-16 00:17:23 -07:00
The Android Open Source Project
The Android Automerger
Michael Jurka
Fabrice Di Meglio
Baligh Uddin
Winson Chung
Narayan Kamath
Adam Cohen
Dianne Hackborn