diff --git a/dipper/Cit.apk/res/values/strings.xml b/dipper/Cit.apk/res/values/strings.xml
index 7b5211198..25266c6ee 100644
--- a/dipper/Cit.apk/res/values/strings.xml
+++ b/dipper/Cit.apk/res/values/strings.xml
@@ -1023,11 +1023,16 @@ the specified position"</string>
   <string name="placeholder">占位置</string>
   <string name="plugout_and_reverse_plugin">"
 Please plug out the charger and reverse plug in."</string>
+  <string name="pop_camera">Pop Camera</string>
+  <string name="pop_push_camera_test_summary">"Click the Pop Camera Button to see if the camera comes out
+Click the Push Camera Button to see if the camera comes in"</string>
+  <string name="pop_push_camera_test_title">Pop and Push Camera Test</string>
   <string name="preprocess_time">预处理耗时:</string>
   <string name="preprocess_version">预处理版本:</string>
   <string name="product_list">ProductList</string>
   <string name="production_date">生产日期:</string>
   <string name="protocol_version">协议版本：</string>
+  <string name="push_camera">Push Camera</string>
   <string name="radio_boy">Man voice</string>
   <string name="radio_chinese">Chinese</string>
   <string name="radio_english">English</string>
@@ -1089,6 +1094,9 @@ Please plug out the charger and reverse plug in."</string>
   <string name="sar_sensor_collect_data_test_summary">"Rotate the phone to ensure that the real-time angle is between 130 and 140 degrees
 Keep the other hand away from the cell phone. Click on the start data acquisition button
 After calibrate success,Observe that the absolute value of CS0i and CS1 is less than 200 and the value of CS1 is more than 300. After five consecutive times, the other hand is close to the bottom of the cell phone,The value of CS0 is highlighted by the button after 3 consecutive times between 3000 and 30000,the pass button is highlight"</string>
+  <string name="sar_sensor_collect_test_summary">"Rotate the phone, put it to the fixture
+Click the Start data acquisition button
+Control the fixture close and away from the phone"</string>
   <string name="sar_sensor_data_check_description">Sar Sensor Data Collect</string>
   <string name="sar_sensor_data_check_summary">"Hold the top of the phone with one hand
 Make sure the real time Angle is about 45 degrees
diff --git a/dipper/CloudBackup.apk/res/values/strings.xml b/dipper/CloudBackup.apk/res/values/strings.xml
index b786e6140..8e6e74fa2 100644
--- a/dipper/CloudBackup.apk/res/values/strings.xml
+++ b/dipper/CloudBackup.apk/res/values/strings.xml
@@ -61,9 +61,9 @@ Note: Data for apps you've installed won't be backed up to Mi Cloud."</string>
   <string name="cloud_back_up_no_network_warn">"Can't connect to WLAN"</string>
   <string name="cloud_back_up_ok_btn">OK</string>
   <string name="cloud_back_up_opening">Just a sec…</string>
-  <string name="cloud_back_up_share_activity_confirm">Upgrade</string>
-  <string name="cloud_back_up_share_activity_discription">Get more storage space, daily backups, and more.</string>
-  <string name="cloud_back_up_share_activity_title">Upgrade Mi Account</string>
+  <string name="cloud_back_up_subscribe_vip_confirm">Upgrade</string>
+  <string name="cloud_back_up_subscribe_vip_discription">Get more storage space, daily backups, and more.</string>
+  <string name="cloud_back_up_subscribe_vip_title">Upgrade Mi Account</string>
   <string name="cloud_back_up_task">Backing up…</string>
   <string name="cloud_backup">Mi Cloud backups</string>
   <string name="cloud_backup_derail_size_summary">Size: %s</string>
diff --git a/dipper/MiuiCamera.apk/res/values/arrays.xml b/dipper/MiuiCamera.apk/res/values/arrays.xml
index 15b83aba2..f86888595 100644
--- a/dipper/MiuiCamera.apk/res/values/arrays.xml
+++ b/dipper/MiuiCamera.apk/res/values/arrays.xml
@@ -286,6 +286,16 @@
         <item>@string/pref_camera_volumekey_function_entryvalue_zoom</item>
         <item>@string/pref_camera_volumekey_function_entryvalue_volume</item>
     </string-array>
+    <string-array name="pref_live_volumekey_function_entries">
+        <item>@string/pref_camera_volumekey_function_entry_volume</item>
+        <item>@string/pref_camera_volumekey_function_entry_shutter</item>
+        <item>@string/pref_camera_volumekey_function_entry_zoom</item>
+    </string-array>
+    <string-array name="pref_live_volumekey_function_entryvalues">
+        <item>@string/pref_camera_volumekey_function_entryvalue_volume</item>
+        <item>@string/pref_camera_volumekey_function_entryvalue_shutter</item>
+        <item>@string/pref_camera_volumekey_function_entryvalue_zoom</item>
+    </string-array>
     <string-array name="pref_front_mirror_entries">
         <item>@string/pref_front_mirror_entry_on</item>
         <item>@string/pref_front_mirror_entry_off</item>
diff --git a/dipper/MiuiCamera.apk/res/values/strings.xml b/dipper/MiuiCamera.apk/res/values/strings.xml
index 01f632cfd..bb1352353 100644
--- a/dipper/MiuiCamera.apk/res/values/strings.xml
+++ b/dipper/MiuiCamera.apk/res/values/strings.xml
@@ -8,19 +8,19 @@
   <string name="accessibility_beauty_panel_open">Beautify menu is opened</string>
   <string name="accessibility_beauty_switch_closed">Beautify is off</string>
   <string name="accessibility_beauty_switch_open">Beautify is on</string>
-  <string name="accessibility_bokeh_adjust">虚化程度调节</string>
-  <string name="accessibility_bokeh_level">F%1$s级虚化</string>
+  <string name="accessibility_bokeh_adjust">Adjusting background blur</string>
+  <string name="accessibility_bokeh_level">F%1$s aperture</string>
   <string name="accessibility_camera_lighting_close_panel">Closed lighting menu</string>
   <string name="accessibility_camera_lighting_open_panel">Opened lighting menu</string>
-  <string name="accessibility_camera_liveshot_off">动态照片,关闭状态</string>
-  <string name="accessibility_camera_liveshot_on">动态照片,开启状态</string>
+  <string name="accessibility_camera_liveshot_off">Turned off dynamic shots</string>
+  <string name="accessibility_camera_liveshot_on">Turned on dynamic shots</string>
   <string name="accessibility_camera_picker">Front and rear camera switch</string>
   <string name="accessibility_camera_picker_finish">Switched cameras successfully</string>
   <string name="accessibility_camera_record_start">start record</string>
   <string name="accessibility_camera_record_stop">stop record</string>
   <string name="accessibility_camera_shutter_finish">Took a photo successfully</string>
-  <string name="accessibility_camera_ultra_wide_bokeh_off">全身模式,关闭状态</string>
-  <string name="accessibility_camera_ultra_wide_bokeh_on">全身模式,开启状态</string>
+  <string name="accessibility_camera_ultra_wide_bokeh_off">Full body mode is off</string>
+  <string name="accessibility_camera_ultra_wide_bokeh_on">Full body mode is on</string>
   <string name="accessibility_camera_video_960fps_120">120FPS</string>
   <string name="accessibility_camera_video_960fps_240">240FPS</string>
   <string name="accessibility_camera_video_960fps_960">960FPS</string>
@@ -45,8 +45,8 @@
   <string name="accessibility_hdr_off">HDR is off</string>
   <string name="accessibility_hdr_on">HDR is on</string>
   <string name="accessibility_intent_done_apply">Done</string>
-  <string name="accessibility_lighting_panel_off">关闭影棚光效面板</string>
-  <string name="accessibility_lighting_panel_on">打开影棚光效面板</string>
+  <string name="accessibility_lighting_panel_off">Studio lighting bar is hidden</string>
+  <string name="accessibility_lighting_panel_on">Showing studio lighting bar</string>
   <string name="accessibility_more">More</string>
   <string name="accessibility_open">Turned on</string>
   <string name="accessibility_peak">Focus peak button</string>
@@ -58,26 +58,28 @@
   <string name="accessibility_setting">Settings</string>
   <string name="accessibility_shutter_button">Shutter button</string>
   <string name="accessibility_stereo_button">Focus adjustment</string>
-  <string name="accessibility_ultra_pixel_photography_off">%d万超清,关闭状态</string>
-  <string name="accessibility_ultra_pixel_photography_on">%d万超清,开启状态</string>
-  <string name="accessibility_ultra_wide_off">超广角,关闭状态</string>
-  <string name="accessibility_ultra_wide_on">超广角,开启状态</string>
+  <string name="accessibility_ultra_pixel_photography_32mp_off">32MP is off</string>
+  <string name="accessibility_ultra_pixel_photography_32mp_on">32MP is on</string>
+  <string name="accessibility_ultra_pixel_photography_48mp_off">48MP is off</string>
+  <string name="accessibility_ultra_pixel_photography_48mp_on">48MP is on</string>
+  <string name="accessibility_ultra_wide_off">Turned off wide angle mode</string>
+  <string name="accessibility_ultra_wide_on">Turned on wide angle mode</string>
   <string name="accessibility_video_capture_button">Photo Button for Video Recording</string>
   <string name="accessibility_video_pause_button">pause record</string>
   <string name="accessibility_video_resume_button">continue record</string>
   <string name="accessibility_zoom_button">Zoom mode</string>
   <string name="ai_scene_mode_use_hint_text">"AI camera detects scenes automatically
 and optimizes your photos based on this info"</string>
-  <string name="ai_scene_top_moon_off">夜景模式</string>
-  <string name="ai_scene_top_tip">月亮模式</string>
+  <string name="ai_scene_top_moon_off">Low light mode</string>
+  <string name="ai_scene_top_tip">Moon mode</string>
   <string name="app_name">algoengine</string>
-  <string name="beauty_body">塑型</string>
-  <string name="beauty_body_body">瘦身</string>
-  <string name="beauty_body_head">头部</string>
-  <string name="beauty_body_legged">长腿</string>
-  <string name="beauty_body_reset_tip">塑型效果已清除</string>
-  <string name="beauty_body_shoulder">肩部</string>
-  <string name="beauty_body_slim_count_tip">塑型仅支持单人拍摄</string>
+  <string name="beauty_body">Figure</string>
+  <string name="beauty_body_body">Slender</string>
+  <string name="beauty_body_head">Head</string>
+  <string name="beauty_body_legged">Legs</string>
+  <string name="beauty_body_reset_tip">Removed figure effects successfully</string>
+  <string name="beauty_body_shoulder">Shoulders</string>
+  <string name="beauty_body_slim_count_tip">Figure effects work only for one person shots</string>
   <string name="beauty_fragment_tab_name_3d_beauty">Beauty</string>
   <string name="beauty_fragment_tab_name_3d_makeup">Makeup</string>
   <string name="beauty_fragment_tab_name_3d_remodeling">Remodeling</string>
@@ -90,9 +92,9 @@ and optimizes your photos based on this info"</string>
   <string name="beauty_level_5">5</string>
   <string name="beauty_mode_reset_toast">Removed remodeling effects</string>
   <string name="beauty_reset">Reset</string>
-  <string name="beauty_reset_toast">美颜效果已清除</string>
-  <string name="beauty_tab_name_live_beauty">美颜</string>
-  <string name="beauty_tab_name_live_filter">滤镜</string>
+  <string name="beauty_reset_toast">Reset figure effects successfully</string>
+  <string name="beauty_tab_name_live_beauty">Beautify</string>
+  <string name="beauty_tab_name_live_filter">Filters</string>
   <string name="button_fisheye_camera_title">Fisheye</string>
   <string name="button_front_camera_title">Make a selfie</string>
   <string name="button_normal_video_title">Record video</string>
@@ -100,8 +102,8 @@ and optimizes your photos based on this info"</string>
   <string name="camera_error_title">Camera error</string>
   <string name="camera_facedetection_sub_option_hint">Experimental feature</string>
   <string name="camera_label">Camera</string>
-  <string name="camera_liveshot_off_tip">动态照片已关闭</string>
-  <string name="camera_liveshot_on_tip">动态照片</string>
+  <string name="camera_liveshot_off_tip">Turned off dynamic shots</string>
+  <string name="camera_liveshot_on_tip">Dynamic shots</string>
   <string name="camera_new_slow_motion_quality_default">5</string>
   <string name="camera_setting">Camera</string>
   <string name="camera_settings_label">Camera</string>
@@ -154,12 +156,12 @@ and optimizes your photos based on this info"</string>
   <string name="confirm_recording_fail_title">"Can't record"</string>
   <string name="confirm_restore_message">"Restore Camera's default settings?"</string>
   <string name="confirm_restore_title">Restore default settings</string>
-  <string name="custom_watermark_contains_senstive_words">Please modify sensitive text %1$s</string>
-  <string name="custom_watermark_tips">The above text will be the second line of the photo watermark. Please limit it to 15 Chinese characters or 15 English letters.</string>
-  <string name="custom_watermark_too_many_words">You went over the character limit</string>
-  <string name="custom_watermark_words">User define watermark words</string>
-  <string name="custom_watermark_words_input_hint">Enter words</string>
-  <string name="custom_watermark_words_save_success">Save sucess</string>
+  <string name="custom_watermark_contains_senstive_words">"Watermarks can't contain restricted terms (%1$s)"</string>
+  <string name="custom_watermark_tips">This text will appear as the second line of your watermark. It can contain up to 18 letters or 14 Chinese characters.</string>
+  <string name="custom_watermark_too_many_words">The text you entered is too long</string>
+  <string name="custom_watermark_words">Custom watermark</string>
+  <string name="custom_watermark_words_input_hint">Enter text</string>
+  <string name="custom_watermark_words_save_success">Saved successfully</string>
   <string name="device_48m_watermark_default_text">48M DUAL CAMERA</string>
   <string name="device_watermark_default_text">AI DUAL CAMERA</string>
   <string name="dialog_ok">OK</string>
@@ -201,6 +203,8 @@ and optimizes your photos based on this info"</string>
   <string name="front_camera_hint_text_place">"Taking selfies will be easier
 if you rotate your phone"</string>
   <string name="front_camera_hint_text_rotate">Rotate your phone</string>
+  <string name="hand_gesture_open_tip">伸出手掌开始倒计时拍照</string>
+  <string name="hand_gesture_tip">手势拍照</string>
   <string name="hibernate_hint">Tap the screen to wake Camera</string>
   <string name="hine_hht">"In low light, camera will take multiple photos
 and then create a shot with a minimal amount of noise."</string>
@@ -232,32 +236,38 @@ in Portrait mode"</string>
   <string name="lighting_pattern_rainbow">Rainbow</string>
   <string name="lighting_pattern_shutter">Blinds</string>
   <string name="lighting_pattern_stage">Stage</string>
-  <string name="live_edit_exit_confirm">Exit</string>
-  <string name="live_edit_exit_message">Discard capture?</string>
+  <string name="live_edit_exit_confirm">Stop</string>
+  <string name="live_edit_exit_message">Stop shooting now?</string>
   <string name="live_edit_share_title">Share</string>
-  <string name="live_error_confirm">Adjust</string>
-  <string name="live_error_message">Function Error</string>
-  <string name="live_error_title">Function Error</string>
-  <string name="live_music_change_bgm">Replace Music</string>
+  <string name="live_error_confirm">Adjust time</string>
+  <string name="live_error_message">Some features might not work properly when system time is incorrect.</string>
+  <string name="live_error_title">"System time isn't correct"</string>
+  <string name="live_music_change_bgm">Change background music</string>
   <string name="live_music_close_cancel_message">Cancel</string>
-  <string name="live_music_close_message">Whether to close the current music?</string>
-  <string name="live_music_close_sure_message">Close</string>
-  <string name="live_music_downloading_tips">Downloading...</string>
-  <string name="live_music_hot_title">Hot Music</string>
-  <string name="live_music_local_title">Local Music</string>
-  <string name="live_music_network_exception">Network anomaly</string>
-  <string name="live_music_network_exception_tips">Network anomalies, please try again click</string>
+  <string name="live_music_close_message">Turn off music now?</string>
+  <string name="live_music_close_sure_message">Turn off</string>
+  <string name="live_music_downloading_tips">Downloading…</string>
+  <string name="live_music_hot_title">Popular songs</string>
+  <string name="live_music_local_title">Local</string>
+  <string name="live_music_network_exception">Network error</string>
+  <string name="live_music_network_exception_tips">A network error occurred. Tap to try again.</string>
   <string name="live_reverse_confirm">Delete</string>
-  <string name="live_reverse_message">Delete last segment?</string>
-  <string name="live_speed_extreme_fast">Fastest</string>
-  <string name="live_speed_extreme_slow">Slowest</string>
+  <string name="live_reverse_message">Delete previously captured item?</string>
+  <string name="live_share_moments">Moments</string>
+  <string name="live_share_qq">QQ</string>
+  <string name="live_share_qzone">QZone</string>
+  <string name="live_share_tik">TikTok</string>
+  <string name="live_share_wechat">WeChat</string>
+  <string name="live_share_weibo">WeiBo</string>
+  <string name="live_speed_extreme_fast">Super fast</string>
+  <string name="live_speed_extreme_slow">Super slow</string>
   <string name="live_speed_fast">Fast</string>
   <string name="live_speed_fragment_tab_name">Speed</string>
-  <string name="live_speed_normal">Normal</string>
+  <string name="live_speed_normal">Regular</string>
   <string name="live_speed_slow">Slow</string>
-  <string name="live_sticker_fragment_tab_name">Magic</string>
+  <string name="live_sticker_fragment_tab_name">Stickers</string>
   <string name="live_sticker_network_error_hint">Network error</string>
-  <string name="live_sticker_updating">Updating...</string>
+  <string name="live_sticker_updating">Updating…</string>
   <string name="makeup_reset_toast">Removed makeup effects</string>
   <string name="message_snap_double_confirm">Long pressing the volume button triggers NFC now. Replace this feature?</string>
   <string name="module_name_beauty">Beauty</string>
@@ -271,6 +281,7 @@ in Portrait mode"</string>
   <string name="module_name_square">Square</string>
   <string name="module_name_video">Video</string>
   <string name="multi_window_mode_not_supported">"Camera doesn't work in Split screen"</string>
+  <string name="network_access_user_notice_title">Connecting to the internet</string>
   <string name="no_storage">Insert SD card before using camera</string>
   <string name="not_enough_space">SD card is full</string>
   <string name="object_track_enable_toast">To select an object, simultaneously tap two diagonal points around its border.</string>
@@ -427,8 +438,8 @@ and brings out the people in the front."</string>
   <string name="pref_camera_multilevel_entry_lowest">Lowest</string>
   <string name="pref_camera_multilevel_entry_middle">Medium (default)</string>
   <string name="pref_camera_multilevel_entry_normal">Normal</string>
-  <string name="pref_camera_normal_wide_ldc_description">修正照片边缘的人脸畸变</string>
-  <string name="pref_camera_normal_wide_ldc_title">合影人脸修正</string>
+  <string name="pref_camera_normal_wide_ldc_description">Correct distorted faces of the people who are close to the edge of the frame</string>
+  <string name="pref_camera_normal_wide_ldc_title">Correct face distortions on group photos</string>
   <string name="pref_camera_optimized_flash_enable_title">Optimized flash</string>
   <string name="pref_camera_parallel_process_enable_title">Turn on parallel processing</string>
   <string name="pref_camera_picture_format_entry_raw">Raw</string>
@@ -484,9 +495,9 @@ and brings out the people in the front."</string>
   <string name="pref_camera_tilt_shift_entryvalue_parallel">parallel</string>
   <string name="pref_camera_tilt_shift_title">Tilt-shift</string>
   <string name="pref_camera_touchafaec_default">touch-on</string>
-  <string name="pref_camera_ultra_wide_ldc_description">在超广角模式下对画面畸变进行矫正</string>
-  <string name="pref_camera_ultra_wide_ldc_title">超广角畸变矫正</string>
-  <string name="pref_camera_ultra_wide_mode_title">超广角模式</string>
+  <string name="pref_camera_ultra_wide_ldc_description">Correct distorted objects automatically</string>
+  <string name="pref_camera_ultra_wide_ldc_title">Correct distortion in wide shots</string>
+  <string name="pref_camera_ultra_wide_mode_title">Wide angle mode</string>
   <string name="pref_camera_video_bokeh_off">Video bokeh is closed</string>
   <string name="pref_camera_video_bokeh_on">Video bokeh</string>
   <string name="pref_camera_volumekey_function_default">timer</string>
@@ -504,7 +515,7 @@ and brings out the people in the front."</string>
   <string name="pref_camera_whitebalance_entry_auto">AUTO</string>
   <string name="pref_camera_whitebalance_title">WB</string>
   <string name="pref_camera_zoom_mode_entry_tele">TELE</string>
-  <string name="pref_camera_zoom_mode_entry_ultra">ULTRA</string>
+  <string name="pref_camera_zoom_mode_entry_ultra">Wide angle</string>
   <string name="pref_camera_zoom_mode_entry_wide">WIDE</string>
   <string name="pref_camera_zoom_mode_title">LENS</string>
   <string name="pref_camera_zoom_value_title">Zoom</string>
@@ -528,11 +539,14 @@ and brings out the people in the front."</string>
   <string name="pref_front_mirror_title">Mirror front camera</string>
   <string name="pref_google_lens">Google lens</string>
   <string name="pref_groupshot_with_primitive_title">Save original photos as well</string>
+  <string name="pref_live_volumekey_function_default">volume</string>
   <string name="pref_manual_exposure_title">S</string>
-  <string name="pref_menu_ultra_pixel_photography">%d万超清</string>
+  <string name="pref_menu_ultra_pixel_photography_32mp">32MP</string>
+  <string name="pref_menu_ultra_pixel_photography_48mp">48MP</string>
   <string name="pref_mi_front_video_quality_default">6</string>
   <string name="pref_mtk_video_quality_default">10</string>
   <string name="pref_new_slow_motion_video_quality_240_720only">You can only record 720p videos with 240fps</string>
+  <string name="pref_new_slow_motion_video_quality_960_720only">You can only record 720p videos with 960fps</string>
   <string name="pref_new_slow_motion_video_quality_entry_1080p">FHD 1080p</string>
   <string name="pref_new_slow_motion_video_quality_entry_720p">HD 720p</string>
   <string name="pref_priority_storage_title">Save to SD card</string>
@@ -549,7 +563,7 @@ and brings out the people in the front."</string>
   <string name="pref_skin_beautify_eye_default">2</string>
   <string name="pref_skin_beautify_slim_default">3</string>
   <string name="pref_skin_beautify_smooth_default">5</string>
-  <string name="pref_userdefine_watermark_title">User define camera watermark</string>
+  <string name="pref_userdefine_watermark_title">Custom watermark</string>
   <string name="pref_video_autoexposure_default">1</string>
   <string name="pref_video_encoder_default">h264</string>
   <string name="pref_video_encoder_entry_h264">H.264 High compatibility</string>
@@ -615,21 +629,23 @@ and brings out the people in the front."</string>
   <string name="toast_saving">Saving photos…</string>
   <string name="ubi_focus_capture_fail">"Couldn't take photo"</string>
   <string name="ubifocus_capture_warning_message">For best results, your photo should contain objects both near (less than 1 meter from the lens) and far</string>
-  <string name="ultra_pixel_photography_close_tip">%d万超清已关闭</string>
-  <string name="ultra_pixel_photography_open_tip">%d万超清</string>
-  <string name="ultra_wide_bokeh_close_tip">全身模式已关闭</string>
-  <string name="ultra_wide_bokeh_open_tip">全身模式</string>
-  <string name="ultra_wide_close_tip">超广角模式已关闭</string>
-  <string name="ultra_wide_mode">超广角</string>
-  <string name="ultra_wide_open_tip">超广角模式</string>
-  <string name="ultra_wide_recommend_tip_hint">建议开启超广角模式</string>
-  <string name="ultra_widem_mode_use_hint_text">"开启超广角模式，为您记录更广阔的视野
-探索更多精彩的美"</string>
+  <string name="ultra_pixel_photography_32mp_close_tip">32MP is off</string>
+  <string name="ultra_pixel_photography_32mp_open_tip">32MP</string>
+  <string name="ultra_pixel_photography_48mp_close_tip">48MP is off</string>
+  <string name="ultra_pixel_photography_48mp_open_tip">48MP</string>
+  <string name="ultra_wide_bokeh_close_tip">Full body mode is off</string>
+  <string name="ultra_wide_bokeh_open_tip">Full body mode</string>
+  <string name="ultra_wide_close_tip">Wide angle mode is off</string>
+  <string name="ultra_wide_mode">Wide angle</string>
+  <string name="ultra_wide_mode_use_hint_text">"Use this mode to include more of the scene in your photo.
+Wide angle mode comes to help when you can't move farther from the scene."</string>
+  <string name="ultra_wide_open_tip">Wide angle mode</string>
+  <string name="ultra_wide_recommend_tip_hint">Try wide angle mode</string>
   <string name="user_agree">Agree</string>
   <string name="user_agreement2">Terms of Service</string>
   <string name="user_agreement4">Privacy Policy</string>
   <string name="user_notice_identify_summary_format">"By using this service, you agree to Xiaomi's %1$s and %2$s. Do you agree to connect to the internet?"</string>
-  <string name="user_notice_title">Network Connection Agreement</string>
+  <string name="user_notice_title">Terms and Conditions</string>
   <string name="video_camera_label">Camcorder</string>
   <string name="video_effect_entry_blackwhite">B&amp;W</string>
   <string name="video_effect_entry_bygone">Bygone</string>
@@ -640,4 +656,5 @@ and brings out the people in the front."</string>
   <string name="video_file_name_format">"'VID'_yyyyMMdd_HHmmss"</string>
   <string name="video_reach_size_limit">Size limit reached.</string>
   <string name="view_privacy_policy">View Privacy Policy</string>
+  <string name="zoom_no_support_tip_48M">4800万超清模式下不支持变焦</string>
 </resources>
diff --git a/dipper/MiuiScreenRecorder.apk/res/values/strings.xml b/dipper/MiuiScreenRecorder.apk/res/values/strings.xml
index e6c0ed7f8..ec3ccd330 100644
--- a/dipper/MiuiScreenRecorder.apk/res/values/strings.xml
+++ b/dipper/MiuiScreenRecorder.apk/res/values/strings.xml
@@ -87,4 +87,5 @@
   <string name="unchecked">Not selected</string>
   <string name="using_record_confirm_cancel">Restrict</string>
   <string name="using_record_confirm_ok">Allow</string>
+  <string name="warning_recording_when_a2dp_connect">"Your device doesn't support recording system sounds while Bluetooth headset is being used."</string>
 </resources>
diff --git a/dipper/MiuiSystemUI.apk/res/values/arrays.xml b/dipper/MiuiSystemUI.apk/res/values/arrays.xml
index 86abcb8dc..035bf164d 100644
--- a/dipper/MiuiSystemUI.apk/res/values/arrays.xml
+++ b/dipper/MiuiSystemUI.apk/res/values/arrays.xml
@@ -245,9 +245,9 @@
     </string-array>
     <string-array name="bluetooth_audio_active_device_summaries">
         <item></item>
-        <item>, active</item>
-        <item>, active (media)</item>
-        <item>, active (phone)</item>
+        <item>" | Active"</item>
+        <item>" | Active (media)"</item>
+        <item>" | Active (phone)"</item>
     </string-array>
     <string-array name="bluetooth_avrcp_version_values">
         <item>avrcp14</item>
diff --git a/dipper/MiuiSystemUI.apk/res/values/strings.xml b/dipper/MiuiSystemUI.apk/res/values/strings.xml
index 4636dd72c..9584d095d 100644
--- a/dipper/MiuiSystemUI.apk/res/values/strings.xml
+++ b/dipper/MiuiSystemUI.apk/res/values/strings.xml
@@ -361,14 +361,14 @@
   <string name="bluetooth_active_battery_level">Active, %1$s battery</string>
   <string name="bluetooth_active_no_battery_level">Active</string>
   <string name="bluetooth_battery_level">%1$s battery</string>
-  <string name="bluetooth_connected">Connected %1$s</string>
-  <string name="bluetooth_connected_battery_level">Connected, battery %1$s%2$s</string>
+  <string name="bluetooth_connected">Connected%1$s</string>
+  <string name="bluetooth_connected_battery_level">Connected | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_a2dp">Connected (no media) %1$s</string>
-  <string name="bluetooth_connected_no_a2dp_battery_level">Connected (no media), battery %1$s%2$s</string>
+  <string name="bluetooth_connected_no_a2dp_battery_level">Connected (no media) | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_headset">Connected (no phone) %1$s</string>
-  <string name="bluetooth_connected_no_headset_battery_level">Connected (no phone), battery %1$s%2$s</string>
+  <string name="bluetooth_connected_no_headset_battery_level">Connected (no phone) | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media) %1$s</string>
-  <string name="bluetooth_connected_no_headset_no_a2dp_battery_level">Connected (no phone or media), battery %1$s%2$s</string>
+  <string name="bluetooth_connected_no_headset_no_a2dp_battery_level">Connected (no phone or media) | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_map">Connected (no message access) %1$s</string>
   <string name="bluetooth_connecting">Connecting…</string>
   <string name="bluetooth_disable_absolute_volume">Disable absolute volume</string>
diff --git a/dipper/PersonalAssistant.apk/res/values/plurals.xml b/dipper/PersonalAssistant.apk/res/values/plurals.xml
index e2c80d225..8c50faf1c 100644
--- a/dipper/PersonalAssistant.apk/res/values/plurals.xml
+++ b/dipper/PersonalAssistant.apk/res/values/plurals.xml
@@ -33,6 +33,10 @@
     <plurals name="mins_ago">
         <item quantity="other">%1$dmin ago</item>
     </plurals>
+    <plurals name="miot_device_camera_size">
+        <item quantity="other">%d smart cameras</item>
+        <item quantity="one">%d smart camera</item>
+    </plurals>
     <plurals name="payment_record_dialog_delete_message">
         <item quantity="other">Delete %s items from payment?</item>
         <item quantity="one">Delete %s item from payment?</item>
@@ -78,10 +82,6 @@
         <item quantity="other">%d minutes ago</item>
         <item quantity="one">%d minute ago</item>
     </plurals>
-    <plurals name="miot_device_camera_size">
-        <item quantity="other">%d smart cameras</item>
-        <item quantity="one">%d smart camera</item>
-    </plurals>
     <plurals name="book_start_interval">
         <item quantity="other">距出发还有%d天</item>
         <item quantity="one">距出发还有%d天</item>
diff --git a/dipper/PersonalAssistant.apk/res/values/strings.xml b/dipper/PersonalAssistant.apk/res/values/strings.xml
index 9feaeccc4..fb3707894 100644
--- a/dipper/PersonalAssistant.apk/res/values/strings.xml
+++ b/dipper/PersonalAssistant.apk/res/values/strings.xml
@@ -1274,6 +1274,8 @@ Several orders sent via SF Express from the vendors outside of Taobao, Tmall, an
   <string name="not_installed">Not installed</string>
   <string name="note_name">Create</string>
   <string name="note_parent">Notes</string>
+  <string name="notification_channel_card">Cards</string>
+  <string name="notification_channel_default">Default</string>
   <string name="notification_content_fail_not_support">"Couldn't get payment info, add the record manually."</string>
   <string name="notification_content_fail_stay_longer">Stay on the payment page for at least 1 second</string>
   <string name="notification_content_success">%2$s CNY payment in %1$s</string>
@@ -1518,6 +1520,7 @@ Several orders sent via SF Express from the vendors outside of Taobao, Tmall, an
   <string name="shopping_setting_jingdong">JD</string>
   <string name="shopping_setting_mishop">Mi Store</string>
   <string name="shopping_setting_notification">Notify about new items</string>
+  <string name="shopping_setting_pinduoduo">Pinduoduo</string>
   <string name="shopping_setting_remove">After you revoke authorization, App vault will stop collecting the info about your purchases, and the Shopping card will be removed. Revoke anyway?</string>
   <string name="shopping_setting_taobao">Taobao</string>
   <string name="shopping_setting_tmall">Tmall</string>
diff --git a/dipper/SecurityCenter.apk/res/values/strings.xml b/dipper/SecurityCenter.apk/res/values/strings.xml
index b4c8d6ab4..a704fde4f 100644
--- a/dipper/SecurityCenter.apk/res/values/strings.xml
+++ b/dipper/SecurityCenter.apk/res/values/strings.xml
@@ -2532,6 +2532,10 @@ Remaining data includes data that has been rolled over from the previous month."
   <string name="traffic_setting_fragment_sms_content">Message content</string>
   <string name="traffic_setting_fragment_sms_content_tips">Write your message here</string>
   <string name="traffic_setting_fragment_title">Data usage query</string>
+  <string name="traffic_setting_fragment_title_guide">Carriers and data plans</string>
+  <string name="traffic_usage_warning_body">"You've already used %s of mobile data this month."</string>
+  <string name="traffic_usage_warning_limit">Data usage warning limit</string>
+  <string name="traffic_usage_warning_title">Data usage warning</string>
   <string name="traffic_warning_purchase_title">Mobile data usage warning</string>
   <string name="try_game">Try</string>
   <string name="try_recommended_function">Protect your device using new Security features</string>
diff --git a/dipper/Settings.apk/res/values/arrays.xml b/dipper/Settings.apk/res/values/arrays.xml
index 5b40dcd1a..1587655df 100644
--- a/dipper/Settings.apk/res/values/arrays.xml
+++ b/dipper/Settings.apk/res/values/arrays.xml
@@ -527,9 +527,9 @@
     </string-array>
     <string-array name="bluetooth_audio_active_device_summaries">
         <item></item>
-        <item>, active</item>
-        <item>, active (media)</item>
-        <item>, active (phone)</item>
+        <item>" | Active"</item>
+        <item>" | Active (media)"</item>
+        <item>" | Active (phone)"</item>
     </string-array>
     <string-array name="bluetooth_avrcp_version_values">
         <item>avrcp14</item>
diff --git a/dipper/Settings.apk/res/values/strings.xml b/dipper/Settings.apk/res/values/strings.xml
index 8c7350985..c832f0232 100644
--- a/dipper/Settings.apk/res/values/strings.xml
+++ b/dipper/Settings.apk/res/values/strings.xml
@@ -825,15 +825,15 @@ Apps:
   <string name="bluetooth_confirm_passkey_msg">To pair with:&lt;br&gt;&lt;b&gt;%1$s&lt;/b&gt;&lt;br&gt;&lt;br&gt;Make sure it is showing this passkey:&lt;br&gt;&lt;b&gt;%2$s&lt;/b&gt;</string>
   <string name="bluetooth_connect_failed">"Couldn't connect. Try again."</string>
   <string name="bluetooth_connect_specific_profiles_title">Connect to…</string>
-  <string name="bluetooth_connected">Connected %1$s</string>
-  <string name="bluetooth_connected_battery_level">Connected, battery %1$s%2$s</string>
+  <string name="bluetooth_connected">Connected%1$s</string>
+  <string name="bluetooth_connected_battery_level">Connected | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_multiple_devices_summary">Connected to multiple devices</string>
   <string name="bluetooth_connected_no_a2dp">Connected (no media) %1$s</string>
-  <string name="bluetooth_connected_no_a2dp_battery_level">Connected (no media), battery %1$s%2$s</string>
+  <string name="bluetooth_connected_no_a2dp_battery_level">Connected (no media) | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_headset">Connected (no phone) %1$s</string>
-  <string name="bluetooth_connected_no_headset_battery_level">Connected (no phone), battery %1$s%2$s</string>
+  <string name="bluetooth_connected_no_headset_battery_level">Connected (no phone) | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media) %1$s</string>
-  <string name="bluetooth_connected_no_headset_no_a2dp_battery_level">Connected (no phone or media), battery %1$s%2$s</string>
+  <string name="bluetooth_connected_no_headset_no_a2dp_battery_level">Connected (no phone or media) | Battery %1$s%2$s</string>
   <string name="bluetooth_connected_no_map">Connected (no message access) %1$s</string>
   <string name="bluetooth_connected_summary">Connected to %1$s</string>
   <string name="bluetooth_connecting">Connecting…</string>
@@ -2140,6 +2140,7 @@ For more details, contact your organization's admin."</string>
   <string name="eq_preset_hint">Effect name</string>
   <string name="eq_preset_rename">Rename</string>
   <string name="eq_preset_select">Choose a preset</string>
+  <string name="eq_return">Return</string>
   <string name="eq_rock">Rock</string>
   <string name="equalizer">Equalizer</string>
   <string name="erase_application">Erase apps</string>
@@ -3832,7 +3833,11 @@ This will also give the app the ability to turn Do Not Disturb on or off and cha
   <string name="page_layout_8">Mi Life</string>
   <string name="page_layout_9">Themes</string>
   <string name="page_layout_confirm_message">Your device needs to reboot to apply these changes. This takes about 1 minute.</string>
+  <string name="page_layout_confirm_message_enlarge">Text, images, and icons will be enlarged. Some icons might change their places.</string>
+  <string name="page_layout_confirm_message_narrow">Text, images, and icons will become smaller. Some icons might change their places.</string>
   <string name="page_layout_confirm_title">Change display settings</string>
+  <string name="page_layout_confirm_title_enlarge">Bigger items</string>
+  <string name="page_layout_confirm_title_narrow">Smaller items</string>
   <string name="page_layout_godzilla_title">XXL</string>
   <string name="page_layout_huge_title">XL</string>
   <string name="page_layout_large_title">L</string>
@@ -4467,6 +4472,7 @@ This setting affects all users on this phone."</string>
   <string name="screen_on_proximity_sensor_summary">Lock touch gestures when placed in a pocket</string>
   <string name="screen_on_proximity_sensor_title">Pocket mode</string>
   <string name="screen_optimize">Contrast</string>
+  <string name="screen_optimize_disabled">"Can't adjust contrast when Reading mode is on"</string>
   <string name="screen_paper_mode_adjust_level">Adjust</string>
   <string name="screen_paper_mode_apps_loading">Just a sec…</string>
   <string name="screen_paper_mode_apps_title">Use Reading mode</string>
diff --git a/dipper/ThemeManager.apk/res/values/arrays.xml b/dipper/ThemeManager.apk/res/values/arrays.xml
index 5989f75b4..72f779cc4 100644
--- a/dipper/ThemeManager.apk/res/values/arrays.xml
+++ b/dipper/ThemeManager.apk/res/values/arrays.xml
@@ -11,16 +11,6 @@
     <string-array name="disable_package_replacement">
         <item>disable package name</item>
     </string-array>
-    <string-array name="pull_down_news_lan">
-        <item>English</item>
-        <item>தமிழ்</item>
-        <item>हिन्दी</item>
-    </string-array>
-    <string-array name="pull_down_news_lan_code">
-        <item>en</item>
-        <item>tamil</item>
-        <item>hindi</item>
-    </string-array>
     <string-array name="set_wallpaper_three_items">
         <item>@string/wallpaper_set_as_lockscreen</item>
         <item>@string/wallpaper_set_as_desktop</item>
diff --git a/dipper/ThemeManager.apk/res/values/strings.xml b/dipper/ThemeManager.apk/res/values/strings.xml
index 939da901d..1b80a3dd6 100644
--- a/dipper/ThemeManager.apk/res/values/strings.xml
+++ b/dipper/ThemeManager.apk/res/values/strings.xml
@@ -78,24 +78,6 @@
   <string name="character_counter_pattern">%1$d / %2$d</string>
   <string name="classification_more_understand_you">Select your favorite category</string>
   <string name="close">Close</string>
-  <string name="common_google_play_services_enable_button">Enable</string>
-  <string name="common_google_play_services_enable_text">"%1$s won't work unless you enable Google Play services."</string>
-  <string name="common_google_play_services_enable_title">Enable Google Play services</string>
-  <string name="common_google_play_services_install_button">Install</string>
-  <string name="common_google_play_services_install_text">"%1$s won't run without Google Play services, which are missing from your device."</string>
-  <string name="common_google_play_services_install_title">Get Google Play services</string>
-  <string name="common_google_play_services_notification_channel_name">Google Play services availability</string>
-  <string name="common_google_play_services_notification_ticker">Google Play services error</string>
-  <string name="common_google_play_services_unknown_issue">%1$s is having trouble with Google Play services. Please try again.</string>
-  <string name="common_google_play_services_unsupported_text">"%1$s won't run without Google Play services, which are not supported by your device."</string>
-  <string name="common_google_play_services_update_button">Update</string>
-  <string name="common_google_play_services_update_text">"%1$s won't run unless you update Google Play services."</string>
-  <string name="common_google_play_services_update_title">Update Google Play services</string>
-  <string name="common_google_play_services_updating_text">"%1$s won't run without Google Play services, which are currently updating."</string>
-  <string name="common_google_play_services_wear_update_text">New version of Google Play services needed. It will update itself shortly.</string>
-  <string name="common_open_on_phone">Open on phone</string>
-  <string name="common_signin_button_text">Sign in</string>
-  <string name="common_signin_button_text_long">Sign in with Google</string>
   <string name="component_backup_preference_title">Back up theme</string>
   <string name="component_category_finest_title">GENERAL</string>
   <string name="component_category_more_title">ADVANCED</string>
@@ -106,7 +88,6 @@
   <string name="current_using_desktop_wallpaper_text">Home screen</string>
   <string name="current_using_lockscreen_wallpaper_text">Lock screen</string>
   <string name="current_version_incompatible">Not compatible</string>
-  <string name="default_web_client_id">1067392201555-n4e19u8ssjk67pqha7bqovdlbq4j5r14.apps.googleusercontent.com</string>
   <string name="deleting">Deleting…</string>
   <string name="description_author">Author</string>
   <string name="description_designer">Designer</string>
@@ -166,8 +147,6 @@
   <string name="favorite_list_format">Favorite %1$s</string>
   <string name="find_more_theme">Find more</string>
   <string name="find_more_wallpapers">Find more</string>
-  <string name="firebase_database_url">https://thememanager-f0d62.firebaseio.com</string>
-  <string name="gcm_defaultSenderId">1067392201555</string>
   <string name="gift_anonymous">Anonymous</string>
   <string name="gift_count_format">%1$s+</string>
   <string name="gift_operation_fail_dlg_abandon">Cancel</string>
@@ -201,10 +180,6 @@
   <string name="gift_use_confirmation_dlg_title">Send this gift?</string>
   <string name="gift_use_fail_dlg_title">Something went wrong</string>
   <string name="gift_used">Sent</string>
-  <string name="google_api_key">AIzaSyANYOs19YEEcrI_FhJhLXwGFiriEBtY6os</string>
-  <string name="google_app_id">1:1067392201555:android:fb80d52055998cf5</string>
-  <string name="google_crash_reporting_api_key">AIzaSyANYOs19YEEcrI_FhJhLXwGFiriEBtY6os</string>
-  <string name="google_storage_bucket">thememanager-f0d62.appspot.com</string>
   <string name="hide_free">Hide free %1$s</string>
   <string name="hide_incompatible">Hide incompatible %1$s</string>
   <string name="hide_pull_down_message">Hide trinket?</string>
@@ -292,7 +267,6 @@
   <string name="present_local_themes_subtitle">Customize your device</string>
   <string name="present_official_themes">Our picks</string>
   <string name="present_online_themes">Get more online themes</string>
-  <string name="project_id">thememanager-f0d62</string>
   <string name="provision_default_theme_title">Default</string>
   <string name="provision_loading_tips">Just a sec…</string>
   <string name="provision_second_title">Select one of the several default themes</string>
@@ -530,13 +504,6 @@
   <string name="resource_waiting_pause">Pause</string>
   <string name="resource_wallpaper_download">Download wallpaper</string>
   <string name="ringtone_set_success">Set successfully</string>
-  <string name="s1">Save image</string>
-  <string name="s2">Allow Ad to store image in Picture gallery?</string>
-  <string name="s3">Accept</string>
-  <string name="s4">Decline</string>
-  <string name="s5">Create calendar event</string>
-  <string name="s6">Allow Ad to create a calendar event?</string>
-  <string name="s7">Test Ad</string>
   <string name="sdcard_not_mounted_dialog_message">"Insert SD card now.
 "</string>
   <string name="sdcard_not_mounted_dialog_title">No SD card detected</string>
@@ -545,7 +512,6 @@
   <string name="selected_resource_file_invalid">"Can't use selected resource file"</string>
   <string name="server_internal_error">A server error occurred. Wait a minute or two and try again.</string>
   <string name="set_color_ring_back_tone">Set a custom ringback tone</string>
-  <string name="set_home_wallpaper_failed">"%s. Can't apply Home screen wallpaper."</string>
   <string name="settings">Settings</string>
   <string name="shortcut_add">Add</string>
   <string name="shortcut_cancel">No thanks</string>
@@ -662,7 +628,6 @@
   <string name="using_theme_next_automatic_update">Automatic updates</string>
   <string name="using_theme_next_automatic_update_summary">Update downloaded themes via Wi-Fi automatically when the screen is locked</string>
   <string name="using_theme_show_ad">Recommendations</string>
-  <string name="using_wallpaper_personal">Personalized wallpaper selection</string>
   <string name="video_audio_apply_success">Configured video with sound successfully</string>
   <string name="video_data_tips_message">Using mobile data may generate additional fees. Continue anyway?</string>
   <string name="video_data_tips_title">Data usage warning</string>
@@ -673,10 +638,6 @@
   <string name="wallpaper_crop">Crop</string>
   <string name="wallpaper_decoded_error">"Can't load wallpaper"</string>
   <string name="wallpaper_detail_load_page_no_network">Connect to the network and try again.</string>
-  <string name="wallpaper_personal_dialog_agree">Personalize</string>
-  <string name="wallpaper_personal_dialog_content">Use this feature to be able to see the selection of wallpapers personalized according to your interests. You can turn this feature on and off in the settings. Personalize wallpapers now?</string>
-  <string name="wallpaper_personal_dialog_disagree">No thanks</string>
-  <string name="wallpaper_personal_dialog_title">Personalize your wallpapers</string>
   <string name="wallpaper_scroll_type_tips">Wallpaper scroll</string>
   <string name="wallpaper_set_as_both">Set both</string>
   <string name="wallpaper_set_as_desktop">Set as Home screen</string>
diff --git a/dipper/Updater.apk/res/values/strings.xml b/dipper/Updater.apk/res/values/strings.xml
index 808171f00..2d59c6942 100644
--- a/dipper/Updater.apk/res/values/strings.xml
+++ b/dipper/Updater.apk/res/values/strings.xml
@@ -57,6 +57,7 @@ Updates are not available for you!"</string>
   <string name="pick_title">Pick using:</string>
   <string name="recovery_desc">Device will reboot to Recover mode now if you are not familiar with the mode cancel future actions. Continue?</string>
   <string name="server_error">Server not responding, application might not work properly!</string>
+  <string name="share_desc">Your MIUI version has been updated to %1$s, check latest changelog at: %2$s</string>
   <string name="share_title">Share with</string>
   <string name="stable">stable</string>
   <string name="status_bar_notification_info_overflow">999+</string>
diff --git a/dipper/extras/weather_4x1/content/manifest.xml b/dipper/extras/weather_4x1/content/manifest.xml
index dd6a71ef8..708e6c42a 100644
--- a/dipper/extras/weather_4x1/content/manifest.xml
+++ b/dipper/extras/weather_4x1/content/manifest.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Gadget version="1" screenWidth="1080" scaleByDensity="false" useVariableUpdater="DateTime.Hour">
+    <ExternalCommands>
+        <Trigger action="resume" condition="not(#not_null)">
+            <BinderCommand name="weather_provider" command="refresh"/>
+        </Trigger>
+    </ExternalCommands>
     <Var name="hour_counter" expression="#hour12" threshold="1">
         <Trigger>
             <BinderCommand name="weather_provider" command="refresh"/>
         </Trigger>
     </Var>
     <VariableBinders>
-         <ContentProviderBinder 
-            name="weather_provider" 
-            uri="content://weather/weather"
+        <ContentProviderBinder
+            name="weather_provider"
+            uri="content://weather/actualWeatherData/1"
             columns="city_name,weather_type,temperature,city_id,aqilevel"
             countName="hasweather">
             <Variable name="weather_location" type="string" column="city_name"/>
@@ -18,7 +23,7 @@
             <Variable name="temperature_unit" type="number" column="temperature_unit"/>
             <Variable name="city_id" type="string" column="city_id"/>
             <Variable name="aqi" type="int" column="aqilevel"/>
-         </ContentProviderBinder>
+        </ContentProviderBinder>
     </VariableBinders>
     <Var name="air_quality" expression="eval(ifelse(ge(#aqi,0)*le(#aqi,50),@air_quality0,gt(#aqi,50)*le(#aqi,100),@air_quality1,gt(#aqi,100)*le(#aqi,150),@air_quality2,gt(#aqi,150)*le(#aqi,200),@air_quality3,gt(#aqi,200)*le(#aqi,300),@air_quality4,gt(#aqi,300),@air_quality5,''))" type="string"/>
 
@@ -32,20 +37,21 @@
 
     <Var name="color_temp" expression="ifelse(#applied_light_wallpaper,'#b3000000','#ffffffff')" type="string"/>
     <Var name="color_desc" expression="ifelse(#applied_light_wallpaper,'#80000000','#ccffffff')" type="string"/>
-    <!-- weather_temperature -->
-    <Text name="text_temp" x="35" y="#view_height-224" fontFamily="miui-thin" color="@color_temp" size="130" textExp="ifelse(#not_null,#weather_temperature + ifelse(eq(#temperature_unit,1),'℃',eq(#temperature_unit,'0'),'℉','℃'),'--')"/>
-    <!-- 晴丨轻度污染 -->
-    <Text x="42" y="#view_height-24" fontFamily="miui-reguler" alignV="bottom" color="@color_desc" size="33.73" textExp="ifelse(#not_null,@weather_description+ifelse(len(@air_quality),'丨'+@air_quality,''),@weather_null)"/>
+    <Group visibility="#not_null">
+        <!-- weather_temperature -->
+        <Text name="text_temp" x="35" y="#view_height-224" fontFamily="miui-thin" color="@color_temp" size="130" textExp="ifelse(#not_null,#weather_temperature + ifelse(eq(#temperature_unit,1),'℃',eq(#temperature_unit,'0'),'℉','℃'),'--')"/>
+        <!-- 晴丨轻度污染 -->
+        <Text x="42" y="#view_height-24" fontFamily="miui-reguler" alignV="bottom" color="@color_desc" size="33.73" textExp="ifelse(#not_null,@weather_description+ifelse((#aqi!=0)*(#aqi!=(-1))*len(@air_quality),' | '+@air_quality,''),@weather_null)"/>
+    </Group>
     <!-- weather_location -->
-    <Text x="#view_width-35-8" y="#view_height-24" fontFamily="miui-reguler" align="right" alignV="bottom" color="@color_desc" size="33.73" textExp="ifelse(#not_null,@weather_location,@weather_location_null)"/>
+    <Text x="#view_width-35-8" y="#view_height-24" fontFamily="miui-reguler" align="right" alignV="bottom" color="@color_desc" size="33.73" textExp="ifelse(#not_null,@weather_location,@weather_null)"/>
     <!-- weather_icon -->
-    <Image x="#view_width-35" y="#view_height-221" align="right" src="weather_icon/weather.png" srcid="#icon_index"/>
+    <Image x="#view_width-35" y="#view_height-221" align="right" src="weather_icon/weather.png" srcid="ifelse(#not_null,#icon_index,1)"/>
     <Button x="0" y="0" w="#view_width" h="#view_height">
         <Triggers>
             <Trigger action="up">
-                <IntentCommand action="android.intent.action.MAIN" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
+                <IntentCommand action="com.miui.weather.widget_weather_detail" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
             </Trigger>
         </Triggers>
     </Button>
 </Gadget>
-
diff --git a/dipper/extras/weather_4x1/content/strings/strings.xml b/dipper/extras/weather_4x1/content/strings/strings.xml
index fdc059f5f..eccde8b58 100644
--- a/dipper/extras/weather_4x1/content/strings/strings.xml
+++ b/dipper/extras/weather_4x1/content/strings/strings.xml
@@ -5,9 +5,9 @@
     <string name="air_quality3">'AQI '+#aqi</string>
     <string name="air_quality4">'AQI '+#aqi</string>
     <string name="air_quality5">'AQI '+#aqi</string>
-    <string name="weather_null"></string>
-    <string name="weather_location_null"></string>
-	<string name="weather_type_0">Clear</string>
+    <string name="weather_null">Tap to get weather info</string>
+    <string name="weather_location_null">No location information</string>
+    <string name="weather_type_0">Clear</string>
     <string name="weather_type_1">Cloudy</string>
     <string name="weather_type_2">Hazy</string>
     <string name="weather_type_3">Foggy</string>
diff --git a/dipper/extras/weather_4x4/content/manifest.xml b/dipper/extras/weather_4x4/content/manifest.xml
index 74355056e..765a7b8e9 100755
--- a/dipper/extras/weather_4x4/content/manifest.xml
+++ b/dipper/extras/weather_4x4/content/manifest.xml
@@ -1,52 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Gadget version="1" resDensity="480" extraResources="sw1440-den640::1.222" extraScaleByDensity="640:1.222" useVariableUpdater="DateTime.Hour">
+<Gadget version="1" screenWidth="1080" scaleByDensity="false" useVariableUpdater="DateTime.Hour">
+    <ExternalCommands>
+        <Trigger action="resume" condition="not(#not_null)">
+            <BinderCommand name="weather_provider" command="refresh"/>
+        </Trigger>
+    </ExternalCommands>
     <Var name="hour_counter" expression="#hour12" threshold="1">
         <Trigger>
             <BinderCommand name="weather_provider" command="refresh"/>
         </Trigger>
     </Var>
     <VariableBinders>
-         <ContentProviderBinder
+        <ContentProviderBinder
             name="weather_provider"
-            uri="content://weather/weather"
+            uri="content://weather/actualWeatherData/1"
             columns="city_id,city_name,weather_type,forecast_type,aqilevel,temperature,tmphighs,tmplows"
             countName="hasweather">
-             <Variable name="weather_location_id" type="string" column="city_id"/>
-             <Variable name="weather_location" type="string" column="city_name"/>
-             <Variable name="weather_id" type="int" column="weather_type"/>
-             <Variable name="weather_id1" type="int" column="weather_type" row="1"/>
-             <Variable name="weather_id2" type="int" column="weather_type" row="2"/>
-             <Variable name="weather_id3" type="int" column="weather_type" row="3"/>
-			 
-             <Variable name="weather_forecast_id" type="int" column="forecast_type"/>
-             <Variable name="weather_aqilevel" type="int" column="aqilevel"/>
-             <Variable name="weather_temperature" type="int" column="temperature"/>
-             <Variable name="weather_temphigh" type="int" column="tmphighs"/>
-             <Variable name="weather_templow" type="int" column="tmplows"/>
-             <Variable name="weather_forecast_id1" type="int" column="forecast_type" row="1"/>
-             <Variable name="weather_temphigh1" type="int" column="tmphighs" row="1"/>
-             <Variable name="weather_templow1" type="int" column="tmplows" row="1"/>
-             <Variable name="weather_forecast_id2" type="int" column="forecast_type" row="2"/>
-             <Variable name="weather_temphigh2" type="int" column="tmphighs" row="2"/>
-             <Variable name="weather_templow2" type="int" column="tmplows" row="2"/>
-             <Variable name="weather_forecast_id3" type="int" column="forecast_type" row="3"/>
-             <Variable name="weather_temphigh3" type="int" column="tmphighs" row="3"/>
-             <Variable name="weather_templow3" type="int" column="tmplows" row="3"/>
-         </ContentProviderBinder>
-         <ContentProviderBinder
+            <Variable name="weather_location_id" type="string" column="city_id"/>
+            <Variable name="weather_location" type="string" column="city_name"/>
+            <Variable name="weather_id" type="int" column="weather_type"/>
+            <Variable name="weather_id1" type="int" column="weather_type" row="1"/>
+            <Variable name="weather_id2" type="int" column="weather_type" row="2"/>
+            <Variable name="weather_id3" type="int" column="weather_type" row="3"/>
+
+            <Variable name="weather_forecast_id" type="int" column="forecast_type"/>
+            <Variable name="weather_aqilevel" type="int" column="aqilevel"/>
+            <Variable name="weather_temperature" type="int" column="temperature"/>
+            <Variable name="weather_temphigh" type="int" column="tmphighs"/>
+            <Variable name="weather_templow" type="int" column="tmplows"/>
+            <Variable name="weather_forecast_id1" type="int" column="forecast_type" row="1"/>
+            <Variable name="weather_temphigh1" type="int" column="tmphighs" row="1"/>
+            <Variable name="weather_templow1" type="int" column="tmplows" row="1"/>
+            <Variable name="weather_forecast_id2" type="int" column="forecast_type" row="2"/>
+            <Variable name="weather_temphigh2" type="int" column="tmphighs" row="2"/>
+            <Variable name="weather_templow2" type="int" column="tmplows" row="2"/>
+            <Variable name="weather_forecast_id3" type="int" column="forecast_type" row="3"/>
+            <Variable name="weather_temphigh3" type="int" column="tmphighs" row="3"/>
+            <Variable name="weather_templow3" type="int" column="tmplows" row="3"/>
+        </ContentProviderBinder>
+        <ContentProviderBinder
             uri="content://weather/selected_city"
             columns="flag"
             whereFormat="posID='%s'" whereParas="@weather_location_id"
             dependency="weather_provider">
-             <Variable name="is_location_city" type="int" column="flag"/>
-         </ContentProviderBinder>
+            <Variable name="is_location_city" type="int" column="flag"/>
+        </ContentProviderBinder>
     </VariableBinders>
     <Var name="weather_description" expression="eval('@weather_type_'+#weather_id)" type="string"/>
     <Var name="weather_description1" expression="eval('@weather_type_'+#weather_id1)" type="string"/>
     <Var name="weather_description2" expression="eval('@weather_type_'+#weather_id2)" type="string"/>
     <Var name="weather_description3" expression="eval('@weather_type_'+#weather_id3)" type="string"/>
-	<Var name="weather_description_null" expression="eval(@weather_type_null)" type="string"/>
-	
+    <Var name="weather_description_null" expression="eval(@weather_type_null)" type="string"/>
+    <Var name="not_null" expression="#hasweather*not(isnull(#weather_id))" />
     <Var name="weather_aqi" expression="eval(ifelse(le(#weather_aqilevel,0),@aqi_pure,le(#weather_aqilevel,50),@aqi_good,le(#weather_aqilevel,100),@aqi_moderate,le(#weather_aqilevel,150),@aqi_pollution,le(#weather_aqilevel,200),@aqi_unhealthy,le(#weather_aqilevel,300),@aqi_dangerous,lt(#weather_aqilevel,500),@aqi_hazardous,@aqi_break))" type="string"/>
 
     <!--debug-->
@@ -57,77 +62,90 @@
     <Var name="color" type="string" expression="ifelse(#applied_light_wallpaper,'#88000000','#ffffffff')"/>
     <Var name="light_color" type="string" expression="ifelse(#applied_light_wallpaper,'#50000000','#80ffffff')"/>
     <Var name="line_color" type="string" expression="ifelse(#applied_light_wallpaper,'#33000000','#80ffffff')"/>
-	
-    <!-- top fragment -->
-    <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/weather.png'" srcid="ifelse(gt(#weather_id,24)+lt(#weather_id,0),10000,#weather_id)" x="#view_width/2" y="235" align="center" alignV="center" visibility="#hasweather"/>
-    <Text enableFontScale="true" textExp="@weather_description+' '+eval(ifelse(le(#weather_aqilevel,0),@aqi_pure,le(#weather_aqilevel,50),@aqi_good,le(#weather_aqilevel,100),@aqi_moderate,le(#weather_aqilevel,150),@aqi_pollution,le(#weather_aqilevel,200),@aqi_unhealthy,le(#weather_aqilevel,300),@aqi_dangerous,lt(#weather_aqilevel,500),@aqi_hazardous,@aqi_break))" x="#view_width/2"  y="375" align="center" size="48" color="@color" visibility="#hasweather"/>
-    <Text enableFontScale="true" textExp="@weather_description_null" x="#view_width/2"  y="375" align="center" size="48" color="@color" visibility="1-#hasweather"/>
-    <!-- based on first horizontal line -->
-    <Group y="#view_height-467" visibility="#hasweather">
-        <!-- center fragment -->
-        <DateTime enableFontScale="true" format="@date_format" x="72" y="-104" alignV="bottom" size="38" color="@color"/>
-        <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/location.png'" x="77" y="-45" alignV="bottom" visibility="#is_location_city"/>
-        <Text text="@weather_location" x="ifelse(#is_location_city,116,72)" y="-50" alignV="bottom" size="38" color="@light_color"/>
-        <ImageNumber number="#weather_temperature" srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/temp.png'" x="#view_width-82" align="right" y="-50" alignV="bottom"/>
-        <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/temp_degree.png'" x="#view_width-82" y="-50" alignV="bottom"/>
 
-        <Line x="50" x1="#view_width-50" strokeColor="@line_color" weight="2"/>
+    <Group visibility="not(#not_null)">
+        <Rectangle x="3" y="10" w="#view_width-6" h="#view_height-138" alpha="0.05*255" fillColor="#ffffff" cornerRadius="28"/>
+        <Image x="#view_width/2" y="#view_height/2-77" align="center" alignV="center" w="96" h="96" src="weather_null_icon.png"/>
+        <Text x="#view_width/2" y="#view_height/2-77+48" align="center" size="33.73" fontFamily="miui-reguler" color="@color" textExp="@weather_null" />
+        <Button x="0" y="0" w="#view_width" h="#view_height">
+            <Triggers>
+                <Trigger action="up">
+                    <IntentCommand action="com.miui.weather.widget_weather_detail" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
+                </Trigger>
+            </Triggers>
+        </Button>
 
-        <!-- bottom fragment -->
-        <Var name="padding" expression="109" const="true"/>
-        <Var name="interval" expression="(#view_width-#padding*2)/3"/>
-        <Group x="#padding">
-            <Text enableFontScale="true" text="@today" align="center" y="50" size="38" color="@color"/>
-            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id,24)+lt(#weather_forecast_id,0),10000,#weather_forecast_id)" align="center" y="160" alignV="center"/>
-            <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh,#weather_templow" align="center" y="226" alignV="center" size="38" color="@color"/>
-        </Group>
-        <Group x="#padding+#interval">
-            <Text enableFontScale="true" text="@tomorrow" align="center" y="50" size="38" color="@color"/>
-            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id1,24)+lt(#weather_forecast_id1,0),10000,#weather_forecast_id1)" align="center" y="160" alignV="center"/>
-            <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh1,#weather_templow1" align="center" y="226" alignV="center" size="38" color="@color"/>
-        </Group>
-        <Group x="#padding+#interval*2">
-            <DateTime enableFontScale="true" value="#time_sys+86400000*2" format="dd/MM" align="center" y="50" size="38" color="@color"/>
-            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id2,24)+lt(#weather_forecast_id2,0),10000,#weather_forecast_id2)" align="center" y="160" alignV="center"/>
-            <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh2,#weather_templow2" align="center" y="226" alignV="center" size="38" color="@color"/>
-        </Group>
-        <Group x="#view_width-#padding">
-            <DateTime enableFontScale="true" value="#time_sys+86400000*3" format="dd/MM" align="center" y="50" size="38" color="@color"/>
-            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id3,24)+lt(#weather_forecast_id3,0),10000,#weather_forecast_id3)" align="center" y="160" alignV="center"/>
-            <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh3,#weather_templow3" align="center" y="226" alignV="center" size="38" color="@color"/>
+    </Group>
+
+    <Group visibility="#not_null">
+        <!-- top fragment -->
+        <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/weather.png'" srcid="ifelse(gt(#weather_id,24)+lt(#weather_id,0),10000,#weather_id)" x="#view_width/2" y="235" align="center" alignV="center" visibility="#hasweather"/>
+        <Text enableFontScale="true" textExp="@weather_description+ifelse((#weather_aqilevel!=0)*(#weather_aqilevel!=(-1))*len(@weather_aqi),' '+@weather_aqi,'')" x="#view_width/2"  y="375" align="center" size="48" color="@color" visibility="#hasweather"/>
+        <Text enableFontScale="true" textExp="@weather_description_null" x="#view_width/2"  y="375" align="center" size="48" color="@color" visibility="1-#hasweather"/>
+        <!-- based on first horizontal line -->
+        <Group y="#view_height-467" visibility="#hasweather">
+            <!-- center fragment -->
+            <DateTime enableFontScale="true" format="@date_format" x="72" y="-104" alignV="bottom" size="38" color="@color"/>
+            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/location.png'" x="77" y="-45-14" alignV="bottom" visibility="#is_location_city"/>
+            <Text text="@weather_location" x="ifelse(#is_location_city,116,72)" y="-50" alignV="bottom" size="38" color="@light_color"/>
+            <ImageNumber number="#weather_temperature" srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/temp.png'" x="#view_width-82" align="right" y="-50" alignV="bottom"/>
+            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/temp_degree.png'" x="#view_width-82" y="-50" alignV="bottom"/>
+
+            <Line x="50" x1="#view_width-50" strokeColor="@line_color" weight="2"/>
+
+            <!-- bottom fragment -->
+            <Var name="padding" expression="109" const="true"/>
+            <Var name="interval" expression="(#view_width-#padding*2)/3"/>
+            <Group x="#padding">
+                <Text enableFontScale="true" text="@today" align="center" y="50" size="38" color="@color"/>
+                <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id,24)+lt(#weather_forecast_id,0),10000,#weather_forecast_id)" align="center" y="160" alignV="center"/>
+                <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh,#weather_templow" align="center" y="226" alignV="center" size="38" color="@color"/>
+            </Group>
+            <Group x="#padding+#interval">
+                <Text enableFontScale="true" text="@tomorrow" align="center" y="50" size="38" color="@color"/>
+                <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id1,24)+lt(#weather_forecast_id1,0),10000,#weather_forecast_id1)" align="center" y="160" alignV="center"/>
+                <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh1,#weather_templow1" align="center" y="226" alignV="center" size="38" color="@color"/>
+            </Group>
+            <Group x="#padding+#interval*2">
+                <DateTime enableFontScale="true" value="#time_sys+86400000*2" format="dd/MM" align="center" y="50" size="38" color="@color"/>
+                <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id2,24)+lt(#weather_forecast_id2,0),10000,#weather_forecast_id2)" align="center" y="160" alignV="center"/>
+                <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh2,#weather_templow2" align="center" y="226" alignV="center" size="38" color="@color"/>
+            </Group>
+            <Group x="#view_width-#padding">
+                <DateTime enableFontScale="true" value="#time_sys+86400000*3" format="dd/MM" align="center" y="50" size="38" color="@color"/>
+                <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/small_weather.png'" srcid="ifelse(gt(#weather_forecast_id3,24)+lt(#weather_forecast_id3,0),10000,#weather_forecast_id3)" align="center" y="160" alignV="center"/>
+                <Text enableFontScale="true" format="%d&#xb0;/%d&#xb0;" paras="#weather_temphigh3,#weather_templow3" align="center" y="226" alignV="center" size="38" color="@color"/>
+            </Group>
+
+            <Line x="50" y="305" x1="#view_width-50" y1="305" strokeColor="@line_color" weight="2"/>
+            <Button x="#view_width/2" y="467-#view_height" w="#view_width" h="650" align="center" contentDescriptionExp="eval(@desc_weather)"/>
+            <Button x="#view_width/8" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_1)"/>
+            <Button x="#view_width/8*3" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_2)"/>
+            <Button x="#view_width/8*5" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_3)"/>
+            <Button x="#view_width/8*7" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_4)"/>
         </Group>
 
-        <Line x="50" y="305" x1="#view_width-50" y1="305" strokeColor="@line_color" weight="2"/>
-		<Button x="#view_width/2" y="467-#view_height" w="#view_width" h="650" align="center" contentDescriptionExp="eval(@desc_weather)"/>
-		<Button x="#view_width/8" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_1)"/>
-		<Button x="#view_width/8*3" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_2)"/>
-		<Button x="#view_width/8*5" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_3)"/>
-		<Button x="#view_width/8*7" y="467-#view_height+650" w="#view_width/4" h="300" align="center" contentDescriptionExp="eval(@desc_weather_4)"/>
+        <Group y="#view_height-467" visibility="1-#hasweather">
+            <DateTime enableFontScale="true" format="@date_format" x="72" y="-104" alignV="bottom" size="38" color="@color"/>
+            <Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/weather_null.png'" x="#view_width-82" align="right" y="-77" alignV="bottom"/>
+            <Line x="50" x1="#view_width-50" strokeColor="@line_color" weight="2"/>
+            <Text enableFontScale="true" textExp="@weather_description_null" align="center" x="#view_width/2" y="160" alignV="center" size="38" color="@color"/>
+            <Line x="50" y="305" x1="#view_width-50" y1="305" strokeColor="@line_color" weight="2"/>
+            <Button x="#view_width/2" y="#view_height/2+467-#view_height" w="#view_width" h="#view_height" align="center" alignV="center" contentDescriptionExp="eval(@desc_weather_null)"/>
+        </Group>
+        <Button x="#view_width/2" y="255" w="380" h="460" align="center" alignV="center">
+            <Triggers>
+                <Trigger action="up">
+                    <IntentCommand action="com.miui.weather.widget_weather_detail" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
+                </Trigger>
+            </Triggers>
+        </Button>
+        <Button x="#view_width/2" y="485" w="#view_width" h="510" align="center">
+            <Triggers>
+                <Trigger action="up">
+                    <IntentCommand action="com.miui.weather.widget_weather_detail" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
+                </Trigger>
+            </Triggers>
+        </Button>
     </Group>
-    
-	<Group y="#view_height-467" visibility="1-#hasweather">
-	    <DateTime enableFontScale="true" format="@date_format" x="72" y="-104" alignV="bottom" size="38" color="@color"/>
-		<Image srcExp="ifelse(#applied_light_wallpaper,'dark','light')+'/weather_null.png'" x="#view_width-82" align="right" y="-77" alignV="bottom"/>
-		<Line x="50" x1="#view_width-50" strokeColor="@line_color" weight="2"/>
-		<Text enableFontScale="true" textExp="@weather_description_null" align="center" x="#view_width/2" y="160" alignV="center" size="38" color="@color"/>
-        <Line x="50" y="305" x1="#view_width-50" y1="305" strokeColor="@line_color" weight="2"/>
-		<Button x="#view_width/2" y="#view_height/2+467-#view_height" w="#view_width" h="#view_height" align="center" alignV="center" contentDescriptionExp="eval(@desc_weather_null)"/>
-	</Group>
-	
-    <Button x="#view_width/2" y="255" w="380" h="460" align="center" alignV="center">
-        <Triggers>
-            <Trigger action="up">
-                <IntentCommand action="android.intent.action.MAIN" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
-            </Trigger>
-        </Triggers>
-    </Button>
-    <Button x="#view_width/2" y="485" w="#view_width" h="510" align="center">
-        <Triggers>
-            <Trigger action="up">
-                <IntentCommand action="android.intent.action.MAIN" package="com.miui.weather2" class="com.miui.weather2.ActivityWeatherMain"/>
-            </Trigger>
-        </Triggers>
-    </Button>
-	
 </Gadget>
-
diff --git a/dipper/extras/weather_4x4/content/strings/strings.xml b/dipper/extras/weather_4x4/content/strings/strings.xml
index e755c09e5..75df7f100 100755
--- a/dipper/extras/weather_4x4/content/strings/strings.xml
+++ b/dipper/extras/weather_4x4/content/strings/strings.xml
@@ -1,4 +1,5 @@
 <resources>
+    <string name="weather_null">Tap to get weather info</string>
     <string name="date_format">EEEE, MMMM d</string>
     <string name="today">Today</string>
     <string name="tomorrow">Tomorrow</string>
@@ -11,7 +12,7 @@
     <string name="aqi_hazardous">'AQI '+#weather_aqilevel</string>
     <string name="aqi_break">'AQI '+#weather_aqilevel</string>
     <string name="weather_type_null">'No data'</string>
-	<string name="weather_type_0">Clear</string>
+    <string name="weather_type_0">Clear</string>
     <string name="weather_type_1">Cloudy</string>
     <string name="weather_type_2">Hazy</string>
     <string name="weather_type_3">Foggy</string>
diff --git a/dipper/extras/weather_4x4/content/strings/strings_zh_CN.xml b/dipper/extras/weather_4x4/content/strings/strings_zh_CN.xml
index 45e1a23de..3d5e276ed 100755
--- a/dipper/extras/weather_4x4/content/strings/strings_zh_CN.xml
+++ b/dipper/extras/weather_4x4/content/strings/strings_zh_CN.xml
@@ -1,15 +1,16 @@
 <resources>
+    <string name="weather_null">点击获取天气数据</string>
     <string name="date_format">MM月dd日 E</string>
     <string name="today">今天</string>
     <string name="tomorrow">明天</string>
-	<string name="desc_weather_null">'暂无数据'</string>
-	<string name="desc_weather">'今天'+', '+@weather_location+', '+int(#month+1)+'月'+#date+'日'+', '+'周'+int(#day_of_week-1)+','+#weather_temperature+'度'+','+@weather_description+','+@weather_aqi</string>
-	<string name="desc_weather_1">'今天'+@weather_description+', '+'最高温'+#weather_temphigh+'度'+','+'最低温'+#weather_templow+'度'</string>
-	<string name="desc_weather_2">'明天'+@weather_description1+', '+'最高温'+#weather_temphigh1+'度'+','+'最低温'+#weather_templow1+'度'</string>
-	<string name="desc_weather_3">'后天'+', '+@datetime2+', '+@weather_description2+', '+'最高温'+#weather_temphigh2+'度'+','+'最低温'+#weather_templow2+'度'</string>
-	<string name="desc_weather_4">'大后天'+', '+@datetime3+', '+@weather_description3+', '+'最高温'+#weather_temphigh3+'度'+','+'最低温'+#weather_templow3+'度'</string>
+    <string name="desc_weather_null">'暂无数据'</string>
+    <string name="desc_weather">'今天'+', '+@weather_location+', '+int(#month+1)+'月'+#date+'日'+', '+'周'+int(#day_of_week-1)+','+#weather_temperature+'度'+','+@weather_description+','+@weather_aqi</string>
+    <string name="desc_weather_1">'今天'+@weather_description+', '+'最高温'+#weather_temphigh+'度'+','+'最低温'+#weather_templow+'度'</string>
+    <string name="desc_weather_2">'明天'+@weather_description1+', '+'最高温'+#weather_temphigh1+'度'+','+'最低温'+#weather_templow1+'度'</string>
+    <string name="desc_weather_3">'后天'+', '+@datetime2+', '+@weather_description2+', '+'最高温'+#weather_temphigh2+'度'+','+'最低温'+#weather_templow2+'度'</string>
+    <string name="desc_weather_4">'大后天'+', '+@datetime3+', '+@weather_description3+', '+'最高温'+#weather_temphigh3+'度'+','+'最低温'+#weather_templow3+'度'</string>
     <string name="weather_type_null">'暂无数据'</string>
-	<string name="aqi_pure">''</string>
+    <string name="aqi_pure">''</string>
     <string name="aqi_good">'空气优'</string>
     <string name="aqi_moderate">'空气良'</string>
     <string name="aqi_pollution">'轻度污染'</string>
diff --git a/dipper/extras/weather_4x4/content/weather_null_icon.png b/dipper/extras/weather_4x4/content/weather_null_icon.png
new file mode 100644
index 000000000..26a3dea7d
Binary files /dev/null and b/dipper/extras/weather_4x4/content/weather_null_icon.png differ
diff --git a/dipper/framework-ext-res.apk/res/values/arrays.xml b/dipper/framework-ext-res.apk/res/values/arrays.xml
index 3c77af0aa..7f8580e94 100644
--- a/dipper/framework-ext-res.apk/res/values/arrays.xml
+++ b/dipper/framework-ext-res.apk/res/values/arrays.xml
@@ -1365,10 +1365,14 @@
         <item>com.autonavi.minimap</item>
     </string-array>
     <string-array name="empty_initial_attach_apn_plmn">
+        <item>20205</item>
         <item>20810</item>
         <item>20811</item>
         <item>20813</item>
         <item>22210</item>
+        <item>26202</item>
+        <item>26209</item>
+        <item>26801</item>
         <item>26806</item>
         <item>45005</item>
         <item>45006</item>
diff --git a/dipper/framework-res.apk/res/values/strings.xml b/dipper/framework-res.apk/res/values/strings.xml
index 8b620105a..f856957fa 100644
--- a/dipper/framework-res.apk/res/values/strings.xml
+++ b/dipper/framework-res.apk/res/values/strings.xml
@@ -319,7 +319,8 @@
   <string name="config_inCallNotificationSound">/system/media/audio/ui/InCallNotification.ogg</string>
   <string name="config_isoImagePath"/>
   <string name="config_keyguardComponent">com.android.systemui/com.android.systemui.keyguard.KeyguardService</string>
-  <string name="config_mainBuiltInDisplayCutout">M879,0.10000354 L878.438235,0.10000354 C858.287069,0.10000354 843.921221,1.92414004 837.818519,24.176374 L832.311611,44.2307187 C825.295731,69.8076784 807.243762,90 776.156733,90 L540,90 L303.843267,90 C272.756238,90 254.704269,69.8076784 247.688389,44.2307187 L242.181481,24.176374 C236.078779,1.92414004 221.712931,0.10000354 201.561765,0.10000354 L201,0.10000354 L201,0 L879,0 L879,0.10000354 Z</string>
+  <string name="config_mainBuiltInDisplayCutout">M339,0.100088051 L338.438235,0.100088051 C318.287069,0.100088051 303.921221,1.92576608 297.818519,24.1968047 L292.311611,44.2680968 C285.295731,69.866671 267.243762,90.0760565 236.156733,90.0760565 L0,90.0760565 L-236.156733,90.0760565 C-267.243762,90.0760565 -285.295731,69.866671 -292.311611,44.2680968 L-297.818519,24.1968047 C-303.921221,1.92576608 -318.287069,0.100088051 -338.438235,0.100088051 L-339,0.100088051 L-339,0 L339,0 L339,0.100088051 Z</string>
+  <string name="config_mainBuiltInDisplayCutoutRectApproximation">@string/config_mainBuiltInDisplayCutout</string>
   <string name="config_managed_provisioning_package">com.android.managedprovisioning</string>
   <string name="config_mediaProjectionPermissionDialogComponent">com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity</string>
   <string name="config_mms_user_agent">Android-Mms/2.0</string>