diff --git a/res/drawable/ic_headset.xml b/res/drawable/ic_headset.xml
new file mode 100644
index 0000000..fbfd5f5
--- /dev/null
+++ b/res/drawable/ic_headset.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="430.333"
+    android:viewportWidth="430.333" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M388.368,199.04c-3.477,-6.029 -9.3,-10.346 -16.08,-11.92V150c0,-82.64 -70.56,-150 -157.28,-150S57.728,67.36 57.728,150v37.12c-6.807,1.669 -12.608,6.107 -16,12.24c-2.637,5.083 -3.932,10.756 -3.76,16.48v81.68c-0.158,5.697 1.136,11.341 3.76,16.4c5.359,9.2 15.555,14.47 26.16,13.52h12.4c0.508,8.46 7.525,15.055 16,15.04h14.08c8.837,0 16,-7.163 16,-16v-141.2c0,-8.837 -7.163,-16 -16,-16h-14.48c-8.837,0 -16,7.163 -16,16v0.64h-6.48V150c0,-73.92 63.36,-134 141.28,-134s141.28,60.08 141.28,134v35.92h-6.48v-0.64c0,-8.837 -7.163,-16 -16,-16h-13.44c-8.837,0 -16,7.163 -16,16v141.76c0.192,8.009 6.277,14.641 14.24,15.52c-1.526,10.175 -6.036,19.669 -12.96,27.28c-12.56,13.92 -33.04,21.92 -60.64,24v-3.52c-0.432,-9.218 -8.219,-16.362 -17.44,-16h-34.32c-9.221,-0.362 -17.008,6.782 -17.44,16v24c0.432,9.218 8.219,16.362 17.44,16h34.64c9.221,0.362 17.008,-6.782 17.44,-16v-4.48c32.4,-2.16 56.88,-11.92 72.48,-29.12c9.721,-10.584 15.852,-23.967 17.52,-38.24c8.074,-0.469 14.528,-6.889 15.04,-14.96h12.4c10.604,0.95 20.801,-4.32 26.16,-13.52c2.624,-5.059 3.918,-10.703 3.76,-16.4v-81.76C392.521,209.987 391.142,204.196 388.368,199.04zM96.288,312.08V201.6c0.082,-0.932 0.082,-1.868 0,-2.8v-13.2l13.44,-0.4v141.36h-13.44V312.08zM80.288,201.2v110.24h-12.4c-9.28,0 -11.44,-3.92 -12.16,-5.28c-1.294,-2.718 -1.899,-5.713 -1.76,-8.72v-81.6c-0.177,-3.027 0.4,-6.051 1.68,-8.8c0.72,-1.28 2.88,-5.28 12.16,-5.28L80.288,201.2zM229.328,402v10.96c-0.356,0.651 -1.02,1.073 -1.76,1.12h-34.64c-0.426,0.031 -0.854,0.031 -1.28,0v-23.36c0.447,-0.368 1.024,-0.541 1.6,-0.48h34.64c0.88,0 1.44,0 1.44,0V402zM333.808,201.6v124.96h-6.32h-0.96h-0.64h-5.6V185.28h13.76L333.808,201.6zM374.288,306.32c-0.72,1.28 -2.88,5.28 -12.16,5.28h-12.32V201.92h12.32c9.28,0 11.44,3.92 12.16,5.28c1.294,2.718 1.899,5.713 1.76,8.72v81.68C376.186,300.607 375.582,303.602 374.288,306.32z"/>
+</vector>
\ No newline at end of file
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index 8e9a0b6..6dd02d9 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -255,4 +255,14 @@
     <string name="status_bar_padding">Thanh đệm thêm thanh trạng thái</string>
     <string name="corner_fwvals">Sử dụng các giá trị khung</string>
     <string name="corner_fwvals_summary">Hữu ích nếu thiết bị thực sự có các góc tròn</string>
+    <!-- Adaptive Playback -->
+    <string name="media_title">Âm nhạc/phương tiện</string>
+    <string name="adaptive_playback_title">Phát lại thích ứng</string>
+    <string name="adaptive_playback_summary">Tạm dừng phương tiện khi âm lượng bị tắt và tiếp tục lại bằng cách tăng âm lượng trong thời gian chờ</string>
+    <string name="adaptive_playback_timeout_title">Thời hạn phát lại</string>
+    <string name="adaptive_playback_timeout_30_secs">30 giây</string>
+    <string name="adaptive_playback_timeout_1_min">1 phút</string>
+    <string name="adaptive_playback_timeout_2_min">2 phút</string>
+    <string name="adaptive_playback_timeout_5_min">5 phút</string>
+    <string name="adaptive_playback_timeout_10_min">10 phút</string>
 </resources>
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 8034a85..1d4c0e8 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -287,4 +287,20 @@
 	<item>7</item>
 	<item>8</item>
     </string-array>
+	
+	<!-- Adaptive Playback -->
+    <string-array name="adaptive_playback_timeout_entries" translatable="false">
+        <item>@string/adaptive_playback_timeout_30_secs</item>
+        <item>@string/adaptive_playback_timeout_1_min</item>
+        <item>@string/adaptive_playback_timeout_2_min</item>
+        <item>@string/adaptive_playback_timeout_5_min</item>
+        <item>@string/adaptive_playback_timeout_10_min</item>
+    </string-array>
+    <string-array name="adaptive_playback_timeout_values" translatable="false">
+        <item>30000</item>
+        <item>60000</item>
+        <item>120000</item>
+        <item>300000</item>
+        <item>600000</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 867e885..c34b133 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -294,4 +294,16 @@
     <string name="corner_fwvals">Use framework values</string>
     <string name="corner_fwvals_summary">Useful if the device actually has rounded corners</string>
 
+
+    <!-- Adaptive Playback -->
+    <string name="media_title">Media</string>
+    <string name="adaptive_playback_title">Adaptive playback</string>
+    <string name="adaptive_playback_summary">Pause media when volume is muted and resume it by increasing volume within the timeout</string>
+    <string name="adaptive_playback_timeout_title">Playback timeout</string>
+    <string name="adaptive_playback_timeout_30_secs">30 seconds</string>
+    <string name="adaptive_playback_timeout_1_min">1 minute</string>
+    <string name="adaptive_playback_timeout_2_min">2 minutes</string>
+    <string name="adaptive_playback_timeout_5_min">5 minutes</string>
+    <string name="adaptive_playback_timeout_10_min">10 minutes</string>
+
 </resources>
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index ae0a8e8..301ea77 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -18,6 +18,26 @@
 	android:title="@string/misc_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+        <PreferenceCategory
+        android:key="media"
+        android:title="@string/media_title">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="adaptive_playback_enabled"
+            android:icon="@drawable/ic_headset"
+            android:title="@string/adaptive_playback_title"
+            android:summary="@string/adaptive_playback_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="adaptive_playback_timeout"
+            android:title="@string/adaptive_playback_timeout_title"
+            android:entries="@array/adaptive_playback_timeout_entries"
+            android:entryValues="@array/adaptive_playback_timeout_values"
+            android:defaultValue="30000"
+            android:dependency="adaptive_playback_enabled" />
+    </PreferenceCategory>
+
         <!-- In-call feedback -->
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
           android:key="incall_feeedback_vibrate"