diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 02:19:31 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 02:20:34 +0000 |
| commit | 50d4e62972f51be99a00aeae38aab9ea4dd065f3 (patch) | |
| tree | 78e42c580240d002f96b20bd5ea7a3a916d0c18f /res/layout-sw720dp | |
| parent | cdb1e61ac246649e6bb6049e969ff1414e13e650 (diff) | |
| download | packages_apps_trebuchet-50d4e62972f51be99a00aeae38aab9ea4dd065f3.zip packages_apps_trebuchet-50d4e62972f51be99a00aeae38aab9ea4dd065f3.tar.gz packages_apps_trebuchet-50d4e62972f51be99a00aeae38aab9ea4dd065f3.tar.bz2 | |
Fix post-merge breakage from the new 4.2 stuff
Diffstat (limited to 'res/layout-sw720dp')
| -rw-r--r-- | res/layout-sw720dp/hotseat.xml | 8 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 3 | ||||
| -rw-r--r-- | res/layout-sw720dp/search_bar.xml | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml index bcd5b9d..a6f636a 100644 --- a/res/layout-sw720dp/hotseat.xml +++ b/res/layout-sw720dp/hotseat.xml @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher2.Hotseat +<com.cyanogenmod.trebuchet.Hotseat xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" launcher:cellCountX="@integer/hotseat_cell_count" launcher:cellCountY="1"> - <com.android.launcher2.CellLayout + <com.cyanogenmod.trebuchet.CellLayout android:id="@+id/layout" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -33,4 +33,4 @@ launcher:widthGap="@dimen/hotseat_width_gap" launcher:heightGap="@dimen/hotseat_height_gap" launcher:maxGap="@dimen/hotseat_width_gap" /> -</com.android.launcher2.Hotseat> +</com.cyanogenmod.trebuchet.Hotseat> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 2397612..fa946e0 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -16,7 +16,7 @@ <com.cyanogenmod.trebuchet.DragLayer xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" android:id="@+id/drag_layer" android:background="@drawable/workspace_bg" @@ -49,7 +49,6 @@ android:paddingRight="@dimen/workspace_right_padding" android:paddingTop="@dimen/workspace_top_padding" android:paddingBottom="@dimen/workspace_bottom_padding" - launcher:defaultScreen="2" launcher:cellCountX="@integer/cell_count_x" launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml index ba0ff38..e979eac 100644 --- a/res/layout-sw720dp/search_bar.xml +++ b/res/layout-sw720dp/search_bar.xml @@ -15,7 +15,7 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" style="@style/SearchDropTargetBar" android:layout_width="match_parent" android:layout_height="@dimen/search_bar_height" @@ -43,7 +43,7 @@ android:layout_height="match_parent" android:src="@drawable/ic_home_search_normal_holo" android:adjustViewBounds="true" /> - </com.android.launcher2.HolographicLinearLayout> + </com.cyanogenmod.trebuchet.HolographicLinearLayout> <!-- Voice search icon --> <com.cyanogenmod.trebuchet.HolographicLinearLayout |