PartsBin: update to Ss12.0

Change-Id: If1ce111a5d066277611addd14768e44bee801635

4 files changed, 33 insertions, 117 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 09b04b1..50626f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,13 +19,16 @@
     <application
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/Theme.SubSettingsBase"
         android:appComponentFactory="androidx.core.app.CoreComponentFactory"
         tools:replace="android:appComponentFactory"
-        android:supportsRtl="true" >
+        android:supportsRtl="true"
+        android:defaultToDeviceProtectedStorage="true"
+        android:directBootAware="true">
 
         <activity
             android:name=".DeviceSettingsActivity"
+            android:exported="true"
             android:label="@string/device_title">
             <intent-filter>
                 <action android:name="com.android.settings.action.EXTRA_SETTINGS" />
@@ -41,9 +44,8 @@
         </activity>
 
         <activity
-            android:name="com.aicp.device.KeyHandler"
-            android:exported="false"
-            android:launchMode="singleTask" />
+            android:name=".KeyHandler"
+            android:exported="false" />
 
         <activity-alias
             android:name="com.aicp.device.DeviceSettings"
@@ -58,7 +60,7 @@
 
         <activity
             android:name="com.aicp.device.GestureSettingsActivity"
-            android:exported="false"
+            android:exported="true"
             android:label="@string/category_gestures_title"
             android:launchMode="singleTask" >
             <intent-filter>
@@ -78,7 +80,8 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="com.aicp.device.Startup" >
+        <receiver android:name="com.aicp.device.Startup"
+            android:exported="false" >
             <intent-filter android:priority="100" >
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
@@ -86,6 +89,7 @@
 
         <service
             android:name="com.aicp.device.PanelModeTileService"
+            android:exported="true"
             android:icon="@drawable/ic_panel_tile"
             android:label="@string/tile_panel_mode"
             android:enabled="@bool/enablePanelModeTile"
@@ -98,6 +102,7 @@
 
         <service
             android:name="com.aicp.device.HBMModeTileService"
+            android:exported="true"
             android:icon="@drawable/ic_hbm_tile"
             android:label="@string/tile_hbm_mode"
             android:enabled="@bool/enableHBMModeTile"
@@ -109,6 +114,7 @@
         </service>
         <service
             android:name="com.aicp.device.DCDModeTileService"
+            android:exported="true"
             android:icon="@drawable/ic_dc_tile"
             android:label="@string/tile_dcd_mode"
             android:enabled="@bool/enableDCDTile"
diff --git a/src/com/aicp/device/DeviceSettingsActivity.java b/src/com/aicp/device/DeviceSettingsActivity.java
index a7c2cdd..4cbaae4 100644
--- a/src/com/aicp/device/DeviceSettingsActivity.java
+++ b/src/com/aicp/device/DeviceSettingsActivity.java
@@ -17,49 +17,19 @@
 */
 package com.aicp.device;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
-public class DeviceSettingsActivity extends Activity {
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
+
+public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
 
-    private DeviceSettings mDeviceSettingsFragment;
-    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
-        if (fragment == null) {
-            mDeviceSettingsFragment = new DeviceSettings();
-            getFragmentManager().beginTransaction()
-                .add(android.R.id.content, mDeviceSettingsFragment)
-                .commit();
-        } else {
-            mDeviceSettingsFragment = (DeviceSettings) fragment;
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            return true;
-        default:
-            break;
-        }
-        return super.onOptionsItemSelected(item);
+        getFragmentManager().beginTransaction()
+            .replace(R.id.content_frame, new DeviceSettings())
+            .commit();
     }
 }
diff --git a/src/com/aicp/device/GestureSettingsActivity.java b/src/com/aicp/device/GestureSettingsActivity.java
index 07b7752..41c37e2 100644
--- a/src/com/aicp/device/GestureSettingsActivity.java
+++ b/src/com/aicp/device/GestureSettingsActivity.java
@@ -17,50 +17,19 @@
 */
 package com.aicp.device;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
-public class GestureSettingsActivity extends Activity {
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
 
-    private GestureSettings mGestureSettingsFragment;
+public class GestureSettingsActivity extends CollapsingToolbarBaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
-        if (fragment == null) {
-            mGestureSettingsFragment = new GestureSettings();
-            getFragmentManager().beginTransaction()
-                .add(android.R.id.content, mGestureSettingsFragment)
-                .commit();
-        } else {
-            mGestureSettingsFragment = (GestureSettings) fragment;
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            return true;
-        default:
-            break;
-        }
-        return super.onOptionsItemSelected(item);
+        getFragmentManager().beginTransaction()
+            .replace(R.id.content_frame, new GestureSettings())
+            .commit();
     }
 }
diff --git a/src/com/aicp/device/PanelSettingsActivity.java b/src/com/aicp/device/PanelSettingsActivity.java
index 673f492..b043b72 100644
--- a/src/com/aicp/device/PanelSettingsActivity.java
+++ b/src/com/aicp/device/PanelSettingsActivity.java
@@ -17,48 +17,19 @@
 */
 package com.aicp.device;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
-import androidx.preference.PreferenceManager;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
-public class PanelSettingsActivity extends Activity {
-    private PanelSettings mPanelSettingsFragment;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.collapsingtoolbar.R;
+
+public class PanelSettingsActivity extends CollapsingToolbarBaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
-        if (fragment == null) {
-            mPanelSettingsFragment = new PanelSettings();
-            getFragmentManager().beginTransaction()
-                .add(android.R.id.content, mPanelSettingsFragment)
-                .commit();
-        } else {
-            mPanelSettingsFragment = (PanelSettings) fragment;
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            return true;
-        default:
-            break;
-        }
-        return super.onOptionsItemSelected(item);
+        getFragmentManager().beginTransaction()
+            .replace(R.id.content_frame, new PanelSettings())
+            .commit();
     }
 }