fix tablet mode

Change-Id: I872dfdeadc90eca6f2cba42ecb68cff7c7652566
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	res/drawable-hdpi/action_about_grey.png
	res/drawable-hdpi/action_about_white.png
	res/drawable-hdpi/bg_cling.png
	res/drawable-hdpi/btn_cling_normal.9.png
	res/drawable-hdpi/btn_cling_pressed.9.png
	res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
	res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
	res/drawable-hdpi/btn_keyboard_key_del_holo.9.png
	res/drawable-hdpi/btn_keyboard_key_equal_holo.9.png
	res/drawable-hdpi/btn_keyboard_key_light_disabled_holo.9.png
	res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
	res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
	res/drawable-hdpi/btn_slider_holo.9.png
	res/drawable-hdpi/calculator_input_field.9.png
	res/drawable-hdpi/cling.png
	res/drawable-hdpi/color_card.9.png
	res/drawable-hdpi/floating_calc_background.9.png
	res/drawable-hdpi/hand.png
	res/drawable-hdpi/ic_launcher_floating.png
	res/drawable-hdpi/ic_launcher_glass.png
	res/drawable-hdpi/ic_menu_overflow.png
	res/drawable-hdpi/ic_warning_150.png
	res/drawable-hdpi/settings_about_icon_grey.png
	res/drawable-hdpi/settings_about_icon_white.png
	res/drawable-hdpi/settings_actions_icon_grey.png
	res/drawable-hdpi/settings_actions_icon_white.png
	res/drawable-hdpi/settings_panels_icon_grey.png
	res/drawable-hdpi/settings_panels_icon_white.png
	res/drawable-hdpi/settings_theme_icon_grey.png
	res/drawable-hdpi/settings_theme_icon_white.png
	res/drawable-hdpi/settings_units_icon_grey.png
	res/drawable-hdpi/settings_units_icon_white.png
	res/drawable-hdpi/store_image_background.9.png
	res/drawable-mdpi/action_about_grey.png
	res/drawable-mdpi/action_about_white.png
	res/drawable-mdpi/bg_cling.png
	res/drawable-mdpi/btn_cling_normal.9.png
	res/drawable-mdpi/btn_cling_pressed.9.png
	res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
	res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
	res/drawable-mdpi/btn_keyboard_key_del_holo.9.png
	res/drawable-mdpi/btn_keyboard_key_equal_holo.9.png
	res/drawable-mdpi/btn_keyboard_key_light_disabled_holo.9.png
	res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
	res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
	res/drawable-mdpi/btn_slider_holo.9.png
	res/drawable-mdpi/calculator_input_field.9.png
	res/drawable-mdpi/cling.png
	res/drawable-mdpi/color_card.9.png
	res/drawable-mdpi/floating_calc_background.9.png
	res/drawable-mdpi/hand.png
	res/drawable-mdpi/ic_launcher_floating.png
	res/drawable-mdpi/ic_launcher_glass.png
	res/drawable-mdpi/ic_menu_overflow.png
	res/drawable-mdpi/settings_about_icon_grey.png
	res/drawable-mdpi/settings_about_icon_white.png
	res/drawable-mdpi/settings_actions_icon_grey.png
	res/drawable-mdpi/settings_actions_icon_white.png
	res/drawable-mdpi/settings_panels_icon_grey.png
	res/drawable-mdpi/settings_panels_icon_white.png
	res/drawable-mdpi/settings_theme_icon_grey.png
	res/drawable-mdpi/settings_theme_icon_white.png
	res/drawable-mdpi/settings_units_icon_grey.png
	res/drawable-mdpi/settings_units_icon_white.png
	res/drawable-sw600dp-hdpi/calc_clear_symbol.png
	res/drawable-sw600dp-hdpi/calculator_input_field.9.png
	res/drawable-sw600dp-mdpi/calc_clear_symbol.png
	res/drawable-sw600dp-mdpi/calculator_input_field.9.png
	res/drawable-sw600dp-xhdpi/calc_clear_symbol.png
	res/drawable-sw600dp-xhdpi/calculator_input_field.9.png
	res/drawable-xhdpi/action_about_grey.png
	res/drawable-xhdpi/action_about_white.png
	res/drawable-xhdpi/bg_cling.png
	res/drawable-xhdpi/btn_cling_normal.9.png
	res/drawable-xhdpi/btn_cling_pressed.9.png
	res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
	res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
	res/drawable-xhdpi/btn_keyboard_key_del_holo.9.png
	res/drawable-xhdpi/btn_keyboard_key_equal_holo.9.png
	res/drawable-xhdpi/btn_keyboard_key_light_disabled_holo.9.png
	res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
	res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
	res/drawable-xhdpi/btn_slider_holo.9.png
	res/drawable-xhdpi/calculator_input_field.9.png
	res/drawable-xhdpi/cling.png
	res/drawable-xhdpi/color_card.9.png
	res/drawable-xhdpi/floating_calc_background.9.png
	res/drawable-xhdpi/hand.png
	res/drawable-xhdpi/ic_launcher_floating.png
	res/drawable-xhdpi/ic_launcher_glass.png
	res/drawable-xhdpi/ic_menu_overflow.png
	res/drawable-xhdpi/settings_about_icon_grey.png
	res/drawable-xhdpi/settings_about_icon_white.png
	res/drawable-xhdpi/settings_actions_icon_grey.png
	res/drawable-xhdpi/settings_actions_icon_white.png
	res/drawable-xhdpi/settings_panels_icon_grey.png
	res/drawable-xhdpi/settings_panels_icon_white.png
	res/drawable-xhdpi/settings_theme_icon_grey.png
	res/drawable-xhdpi/settings_theme_icon_white.png
	res/drawable-xhdpi/settings_units_icon_grey.png
	res/drawable-xhdpi/settings_units_icon_white.png
	res/drawable-xhdpi/store_image_background.9.png
	res/drawable-xxhdpi/color_card.9.png
	res/drawable-xxhdpi/floating_calc_background.9.png
	res/drawable-xxhdpi/grip.png
	res/drawable-xxhdpi/hand.png
	res/drawable-xxhdpi/ic_launcher_floating.png
	res/drawable-xxhdpi/ic_launcher_glass.png
	res/drawable-xxhdpi/store_image_background.9.png
	res/drawable-xxxhdpi/floating_calc_background.9.png
	res/drawable-xxxhdpi/ic_launcher_floating.png
	res/drawable-xxxhdpi/ic_launcher_glass.png

Change-Id: I796628daacecd7aa26eeedc0ee77b38e7340a27b