From 9d195b2f5c83113f88471078b622e4096a6ce240 Mon Sep 17 00:00:00 2001 From: shripad Date: Tue, 25 Jul 2023 21:47:51 +0530 Subject: [PATCH] Spes: parts: Drop thermals for now Revert "spes: parts: Thermal settings's app list improvement" This reverts commit d2fe2744829383d1534328293cedcd18e03a4b0f. Revert "Spes: Parts: Thermal: Fix compilation error" This reverts commit 1a25f9c00f434078eb750f74af73c879d252a799. Revert "spes: parts: Import thermal profile feature" This reverts commit 3faaba82060f4a636fe0f5e7cac77f3fb3188a8f. --- parts/Android.bp | 0 parts/AndroidManifest.xml | 20 +- parts/proguard.flags | 0 parts/res/drawable/ic_refresh_60.xml | 0 parts/res/drawable/ic_refresh_90.xml | 0 parts/res/drawable/ic_refresh_default.xml | 0 parts/res/drawable/ic_thermal_benchmark.xml | 19 - parts/res/drawable/ic_thermal_browser.xml | 11 - parts/res/drawable/ic_thermal_camera.xml | 19 - parts/res/drawable/ic_thermal_default.xml | 19 - parts/res/drawable/ic_thermal_dialer.xml | 18 - parts/res/drawable/ic_thermal_gaming.xml | 19 - parts/res/drawable/ic_thermal_streaming.xml | 19 - parts/res/layout/preference_slider.xml | 0 parts/res/layout/refresh_layout.xml | 0 parts/res/layout/refresh_list_item.xml | 0 parts/res/layout/thermal_layout.xml | 18 - parts/res/layout/thermal_list_item.xml | 63 --- parts/res/values/strings.xml | 11 - parts/res/values/styles.xml | 0 .../settings/BootCompletedReceiver.java | 2 - .../settings/refreshrate/RefreshActivity.java | 0 .../settings/refreshrate/RefreshService.java | 0 .../refreshrate/RefreshSettingsFragment.java | 0 .../settings/refreshrate/RefreshUtils.java | 0 .../settings/thermal/ThermalActivity.java | 45 -- .../settings/thermal/ThermalService.java | 102 ---- .../thermal/ThermalSettingsFragment.java | 440 ------------------ .../settings/thermal/ThermalUtils.java | 170 ------- .../lineageos/settings/utils/FileUtils.java | 0 .../settings/widget/SeekBarPreference.java | 0 31 files changed, 1 insertion(+), 994 deletions(-) mode change 100755 => 100644 parts/Android.bp mode change 100755 => 100644 parts/AndroidManifest.xml mode change 100755 => 100644 parts/proguard.flags mode change 100755 => 100644 parts/res/drawable/ic_refresh_60.xml mode change 100755 => 100644 parts/res/drawable/ic_refresh_90.xml mode change 100755 => 100644 parts/res/drawable/ic_refresh_default.xml delete mode 100644 parts/res/drawable/ic_thermal_benchmark.xml delete mode 100644 parts/res/drawable/ic_thermal_browser.xml delete mode 100644 parts/res/drawable/ic_thermal_camera.xml delete mode 100644 parts/res/drawable/ic_thermal_default.xml delete mode 100644 parts/res/drawable/ic_thermal_dialer.xml delete mode 100644 parts/res/drawable/ic_thermal_gaming.xml delete mode 100644 parts/res/drawable/ic_thermal_streaming.xml mode change 100755 => 100644 parts/res/layout/preference_slider.xml mode change 100755 => 100644 parts/res/layout/refresh_layout.xml mode change 100755 => 100644 parts/res/layout/refresh_list_item.xml delete mode 100644 parts/res/layout/thermal_layout.xml delete mode 100644 parts/res/layout/thermal_list_item.xml mode change 100755 => 100644 parts/res/values/strings.xml mode change 100755 => 100644 parts/res/values/styles.xml mode change 100755 => 100644 parts/src/org/lineageos/settings/BootCompletedReceiver.java mode change 100755 => 100644 parts/src/org/lineageos/settings/refreshrate/RefreshActivity.java mode change 100755 => 100644 parts/src/org/lineageos/settings/refreshrate/RefreshService.java mode change 100755 => 100644 parts/src/org/lineageos/settings/refreshrate/RefreshSettingsFragment.java mode change 100755 => 100644 parts/src/org/lineageos/settings/refreshrate/RefreshUtils.java delete mode 100644 parts/src/org/lineageos/settings/thermal/ThermalActivity.java delete mode 100644 parts/src/org/lineageos/settings/thermal/ThermalService.java delete mode 100644 parts/src/org/lineageos/settings/thermal/ThermalSettingsFragment.java delete mode 100644 parts/src/org/lineageos/settings/thermal/ThermalUtils.java mode change 100755 => 100644 parts/src/org/lineageos/settings/utils/FileUtils.java mode change 100755 => 100644 parts/src/org/lineageos/settings/widget/SeekBarPreference.java diff --git a/parts/Android.bp b/parts/Android.bp old mode 100755 new mode 100644 diff --git a/parts/AndroidManifest.xml b/parts/AndroidManifest.xml old mode 100755 new mode 100644 index 6c3b8c70..ec727e91 --- a/parts/AndroidManifest.xml +++ b/parts/AndroidManifest.xml @@ -57,25 +57,7 @@ android:name="com.android.settings.summary" android:resource="@string/refresh_summary" /> - - - - - - - - - - + - - - - - diff --git a/parts/res/drawable/ic_thermal_browser.xml b/parts/res/drawable/ic_thermal_browser.xml deleted file mode 100644 index 73880a00..00000000 --- a/parts/res/drawable/ic_thermal_browser.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/parts/res/drawable/ic_thermal_camera.xml b/parts/res/drawable/ic_thermal_camera.xml deleted file mode 100644 index 642c0823..00000000 --- a/parts/res/drawable/ic_thermal_camera.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/parts/res/drawable/ic_thermal_default.xml b/parts/res/drawable/ic_thermal_default.xml deleted file mode 100644 index cc78c361..00000000 --- a/parts/res/drawable/ic_thermal_default.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/parts/res/drawable/ic_thermal_dialer.xml b/parts/res/drawable/ic_thermal_dialer.xml deleted file mode 100644 index f87e39b9..00000000 --- a/parts/res/drawable/ic_thermal_dialer.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/parts/res/drawable/ic_thermal_gaming.xml b/parts/res/drawable/ic_thermal_gaming.xml deleted file mode 100644 index 29a13b8f..00000000 --- a/parts/res/drawable/ic_thermal_gaming.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/parts/res/drawable/ic_thermal_streaming.xml b/parts/res/drawable/ic_thermal_streaming.xml deleted file mode 100644 index e6e272ba..00000000 --- a/parts/res/drawable/ic_thermal_streaming.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/parts/res/layout/preference_slider.xml b/parts/res/layout/preference_slider.xml old mode 100755 new mode 100644 diff --git a/parts/res/layout/refresh_layout.xml b/parts/res/layout/refresh_layout.xml old mode 100755 new mode 100644 diff --git a/parts/res/layout/refresh_list_item.xml b/parts/res/layout/refresh_list_item.xml old mode 100755 new mode 100644 diff --git a/parts/res/layout/thermal_layout.xml b/parts/res/layout/thermal_layout.xml deleted file mode 100644 index 3982a35e..00000000 --- a/parts/res/layout/thermal_layout.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/parts/res/layout/thermal_list_item.xml b/parts/res/layout/thermal_list_item.xml deleted file mode 100644 index 475d0477..00000000 --- a/parts/res/layout/thermal_list_item.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/parts/res/values/strings.xml b/parts/res/values/strings.xml old mode 100755 new mode 100644 index fefde5f2..b86e55c3 --- a/parts/res/values/strings.xml +++ b/parts/res/values/strings.xml @@ -21,15 +21,4 @@ Default Standard (60Hz) High (90Hz) - - - Thermal Profiles - Adjust per-app thermal profiles for optimum performance - Default - Benchmark - Browser - Camera - Dialer - Gaming - Streaming diff --git a/parts/res/values/styles.xml b/parts/res/values/styles.xml old mode 100755 new mode 100644 diff --git a/parts/src/org/lineageos/settings/BootCompletedReceiver.java b/parts/src/org/lineageos/settings/BootCompletedReceiver.java old mode 100755 new mode 100644 index 116fd97f..c3e95a13 --- a/parts/src/org/lineageos/settings/BootCompletedReceiver.java +++ b/parts/src/org/lineageos/settings/BootCompletedReceiver.java @@ -24,7 +24,6 @@ import android.util.Log; import org.lineageos.settings.refreshrate.RefreshUtils; -import org.lineageos.settings.thermal.ThermalUtils; public class BootCompletedReceiver extends BroadcastReceiver { @@ -35,6 +34,5 @@ public class BootCompletedReceiver extends BroadcastReceiver { public void onReceive(final Context context, Intent intent) { if (DEBUG) Log.d(TAG, "Received boot completed intent"); RefreshUtils.initialize(context); - ThermalUtils.startService(context); } } diff --git a/parts/src/org/lineageos/settings/refreshrate/RefreshActivity.java b/parts/src/org/lineageos/settings/refreshrate/RefreshActivity.java old mode 100755 new mode 100644 diff --git a/parts/src/org/lineageos/settings/refreshrate/RefreshService.java b/parts/src/org/lineageos/settings/refreshrate/RefreshService.java old mode 100755 new mode 100644 diff --git a/parts/src/org/lineageos/settings/refreshrate/RefreshSettingsFragment.java b/parts/src/org/lineageos/settings/refreshrate/RefreshSettingsFragment.java old mode 100755 new mode 100644 diff --git a/parts/src/org/lineageos/settings/refreshrate/RefreshUtils.java b/parts/src/org/lineageos/settings/refreshrate/RefreshUtils.java old mode 100755 new mode 100644 diff --git a/parts/src/org/lineageos/settings/thermal/ThermalActivity.java b/parts/src/org/lineageos/settings/thermal/ThermalActivity.java deleted file mode 100644 index b92fb385..00000000 --- a/parts/src/org/lineageos/settings/thermal/ThermalActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.thermal; - -import android.os.Bundle; -import android.view.MenuItem; - -import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; -import com.android.settingslib.widget.R; - -public class ThermalActivity extends CollapsingToolbarBaseActivity { - - private static final String TAG_THERMAL = "thermal"; - private static final String THERMAL_SCONFIG = "/sys/class/thermal/thermal_message/sconfig"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getFragmentManager().beginTransaction().replace(R.id.content_frame, - new ThermalSettingsFragment(), TAG_THERMAL).commit(); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - return false; - } -} diff --git a/parts/src/org/lineageos/settings/thermal/ThermalService.java b/parts/src/org/lineageos/settings/thermal/ThermalService.java deleted file mode 100644 index cba90442..00000000 --- a/parts/src/org/lineageos/settings/thermal/ThermalService.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.thermal; - -import android.app.ActivityManager; -import android.app.ActivityTaskManager; -import android.app.ActivityTaskManager.RootTaskInfo; -import android.app.IActivityTaskManager; -import android.app.TaskStackListener; -import android.app.Service; -import android.app.TaskStackListener; -import android.content.BroadcastReceiver; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.IBinder; -import android.os.RemoteException; -import android.util.Log; - -public class ThermalService extends Service { - - private static final String TAG = "ThermalService"; - private static final boolean DEBUG = false; - - private String mPreviousApp; - private ThermalUtils mThermalUtils; - - private IActivityTaskManager mActivityTaskManager; - - private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - mPreviousApp = ""; - mThermalUtils.setDefaultThermalProfile(); - } - }; - - @Override - public void onCreate() { - if (DEBUG) Log.d(TAG, "Creating service"); - try { - mActivityTaskManager = ActivityTaskManager.getService(); - mActivityTaskManager.registerTaskStackListener(mTaskListener); - } catch (RemoteException e) { - // Do nothing - } - mThermalUtils = new ThermalUtils(this); - registerReceiver(); - super.onCreate(); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (DEBUG) Log.d(TAG, "Starting service"); - return START_STICKY; - } - - @Override - public IBinder onBind(Intent intent) { - return null; - } - - private void registerReceiver() { - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_SCREEN_OFF); - filter.addAction(Intent.ACTION_SCREEN_ON); - this.registerReceiver(mIntentReceiver, filter); - } - - private final TaskStackListener mTaskListener = new TaskStackListener() { - @Override - public void onTaskStackChanged() { - try { - final RootTaskInfo info = mActivityTaskManager.getFocusedRootTaskInfo(); - if (info == null || info.topActivity == null) { - return; - } - - String foregroundApp = info.topActivity.getPackageName(); - if (!foregroundApp.equals(mPreviousApp)) { - mThermalUtils.setThermalProfile(foregroundApp); - mPreviousApp = foregroundApp; - } - } catch (Exception e) {} - } - }; -} diff --git a/parts/src/org/lineageos/settings/thermal/ThermalSettingsFragment.java b/parts/src/org/lineageos/settings/thermal/ThermalSettingsFragment.java deleted file mode 100644 index bd33abf2..00000000 --- a/parts/src/org/lineageos/settings/thermal/ThermalSettingsFragment.java +++ /dev/null @@ -1,440 +0,0 @@ -/** - * Copyright (C) 2020 The LineageOS Project - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.lineageos.settings.thermal; - -import android.annotation.Nullable; -import android.content.Context; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.TypedValue; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.ListView; -import android.widget.SectionIndexer; -import android.widget.Spinner; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.preference.PreferenceFragment; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.android.settingslib.applications.ApplicationsState; - -import org.lineageos.settings.R; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class ThermalSettingsFragment extends PreferenceFragment - implements ApplicationsState.Callbacks { - - private AllPackagesAdapter mAllPackagesAdapter; - private ApplicationsState mApplicationsState; - private ApplicationsState.Session mSession; - private ActivityFilter mActivityFilter; - private Map mEntryMap = - new HashMap(); - - private RecyclerView mAppsRecyclerView; - - private ThermalUtils mThermalUtils; - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication()); - mSession = mApplicationsState.newSession(this); - mSession.onResume(); - mActivityFilter = new ActivityFilter(getActivity().getPackageManager()); - - mAllPackagesAdapter = new AllPackagesAdapter(getActivity()); - - mThermalUtils = new ThermalUtils(getActivity()); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.thermal_layout, container, false); - } - - @Override - public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - mAppsRecyclerView = view.findViewById(R.id.thermal_rv_view); - mAppsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - mAppsRecyclerView.setAdapter(mAllPackagesAdapter); - } - - - @OverrideUserListView = view.findViewById(R.id.thermal_list_view); - mUserListView.setAdapter(mAllPackagesAdapter); - mUserListView.setOnItemClickListener(this); - } - public void onResume() { - super.onResume(); - getActivity().setTitle(getResources().getString(R.string.thermal_title)); - rebuild(); - } - - @Override - public void onDestroy() { - super.onDestroy(); - - mSession.onPause(); - mSession.onDestroy(); - } - - @Override - public void onPackageListChanged() { - mActivityFilter.updateLauncherInfoList(); - rebuild(); - } - - @Override - public void onRebuildComplete(ArrayList entries) { - if (entries != null) { - handleAppEntries(entries); - mAllPackagesAdapter.notifyDataSetChanged(); - } - } - - @Override - public void onLoadEntriesCompleted() { - rebuild(); - } - - @Override - public void onAllSizesComputed() { - } - - @Override - public void onLauncherInfoChanged() { - } - - @Override - public void onPackageIconChanged() { - } - - @Override - public void onPackageSizeChanged(String packageName) { - } - - @Override - public void onRunningStateChanged(boolean running) { - } - - private void handleAppEntries(List entries) { - final ArrayList sections = new ArrayList(); - final ArrayList positions = new ArrayList(); - final PackageManager pm = getActivity().getPackageManager(); - String lastSectionIndex = null; - int offset = 0; - - for (int i = 0; i < entries.size(); i++) { - final ApplicationInfo info = entries.get(i).info; - final String label = (String) info.loadLabel(pm); - final String sectionIndex; - - if (!info.enabled) { - sectionIndex = "--"; // XXX - } else if (TextUtils.isEmpty(label)) { - sectionIndex = ""; - } else { - sectionIndex = label.substring(0, 1).toUpperCase(); - } - - if (lastSectionIndex == null || - !TextUtils.equals(sectionIndex, lastSectionIndex)) { - sections.add(sectionIndex); - positions.add(offset); - lastSectionIndex = sectionIndex; - } - - offset++; - } - - mAllPackagesAdapter.setEntries(entries, sections, positions); - mEntryMap.clear(); - for (ApplicationsState.AppEntry e : entries) { - mEntryMap.put(e.info.packageName, e); - } - } - - private void rebuild() { - mSession.rebuild(mActivityFilter, ApplicationsState.ALPHA_COMPARATOR); - } - - private int getStateDrawable(int state) { - switch (state) { - case ThermalUtils.STATE_BENCHMARK: - return R.drawable.ic_thermal_benchmark; - case ThermalUtils.STATE_BROWSER: - return R.drawable.ic_thermal_browser; - case ThermalUtils.STATE_CAMERA: - return R.drawable.ic_thermal_camera; - case ThermalUtils.STATE_DIALER: - return R.drawable.ic_thermal_dialer; - case ThermalUtils.STATE_GAMING: - return R.drawable.ic_thermal_gaming; - case ThermalUtils.STATE_STREAMING: - return R.drawable.ic_thermal_streaming; - case ThermalUtils.STATE_DEFAULT: - default: - return R.drawable.ic_thermal_default; - } - } - - private class ViewHolder extends RecyclerView.ViewHolder { - private TextView title; - private Spinner mode; - private ImageView icon; - private View rootView; - private ImageView stateIcon; - - private ViewHolder(View view) { - super(view); - this.title = view.findViewById(R.id.app_name); - this.mode = view.findViewById(R.id.app_mode); - this.icon = view.findViewById(R.id.app_icon); - this.stateIcon = view.findViewById(R.id.state); - this.rootView = view; - - view.setTag(this); - } - } - - private class ModeAdapter extends BaseAdapter { - - private final LayoutInflater inflater; - private final int[] items = { - R.string.thermal_default, - R.string.thermal_benchmark, - R.string.thermal_browser, - R.string.thermal_camera, - R.string.thermal_dialer, - R.string.thermal_gaming, - R.string.thermal_streaming - }; - - private ModeAdapter(Context context) { - inflater = LayoutInflater.from(context); - - @Override - public int getCount() { - return items.length; - } - - @Override - public Object getItem(int position) { - return items[position]; - } - - @Override - public long getItemId(int position) { - return 0; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - TextView view; - if (convertView != null) { - view = (TextView) convertView; - } else { - view = (TextView) inflater.inflate(android.R.layout.simple_spinner_dropdown_item, - parent, false); - } - - view.setText(items[position]); - view.setTextSize(14f); - - return view; - } - } - - private class AllPackagesAdapter extends RecyclerView.Adapter - implements AdapterView.OnItemSelectedListener, SectionIndexer { - - private final LayoutInflater mInflater; - private final ModeAdapter mModesAdapter; - private List mEntries = new ArrayList<>(); - private String[] mSections; - private int[] mPositions; - - public AllPackagesAdapter(Context context) { - mInflater = LayoutInflater.from(context); - mModesAdapter = new ModeAdapter(context); - mActivityFilter = new ActivityFilter(context.getPackageManager()); - } - - @Override - public int getItemCount() { - return mEntries.size(); - } - - @Override - public long getItemId(int position) { - return mEntries.get(position).id; - } - - @NonNull - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - ViewHolder holder = new ViewHolder(LayoutInflater.from(parent.getContext()) - .inflate(R.layout.thermal_list_item, parent, false)); - Context context = holder.itemView.getContext(); - holder.mode.setAdapter(new ModeAdapter(context)); - holder.mode.setOnItemSelectedListener(this); - return holder; - } - - @Override - public void onBindViewHolder(ViewHolder holder, int position) { - - ApplicationsState.AppEntry entry = mEntries.get(position); - - if (entry == null) { - return ; - } - - holder.title.setText(entry.label); - mApplicationsState.ensureIcon(entry); - holder.icon.setImageDrawable(entry.icon); - int packageState = mThermalUtils.getStateForPackage(entry.info.packageName); - holder.mode.setSelection(packageState, false); - holder.mode.setTag(entry); - holder.stateIcon.setImageResource(getStateDrawable(packageState)); - - } - - private void setEntries(List entries, - List sections, List positions) { - mEntries = entries; - mSections = sections.toArray(new String[sections.size()]); - mPositions = new int[positions.size()]; - for (int i = 0; i < positions.size(); i++) { - mPositions[i] = positions.get(i); - } - notifyDataSetChanged(); - } - - - @Override - public void onItemSelected(AdapterView parent, View view, int position, long id) { - final ApplicationsState.AppEntry entry = (ApplicationsState.AppEntry) parent.getTag(); - int currentState = mThermalUtils.getStateForPackage(entry.info.packageName); - if (currentState != position) { - mThermalUtils.writePackage(entry.info.packageName, position); - notifyDataSetChanged(); - } - } - - @Override - public void onNothingSelected(AdapterView parent) { - } - - @Override - public int getPositionForSection(int section) { - if (section < 0 || section >= mSections.length) { - return -1; - } - - return mPositions[section]; - } - - @Override - public int getSectionForPosition(int position) { - if (position < 0 || position >= getItemCount()) { - return -1; - } - - final int index = Arrays.binarySearch(mPositions, position); - - /* - * Consider this example: section positions are 0, 3, 5; the supplied - * position is 4. The section corresponding to position 4 starts at - * position 3, so the expected return value is 1. Binary search will not - * find 4 in the array and thus will return -insertPosition-1, i.e. -3. - * To get from that number to the expected value of 1 we need to negate - * and subtract 2. - */ - return index >= 0 ? index : -index - 2; - } - - @Override - public Object[] getSections() { - return mSections; - } - } - - private class ActivityFilter implements ApplicationsState.AppFilter { - - private final PackageManager mPackageManager; - private final List mLauncherResolveInfoList = new ArrayList(); - - private ActivityFilter(PackageManager packageManager) { - this.mPackageManager = packageManager; - - updateLauncherInfoList(); - } - - public void updateLauncherInfoList() { - Intent i = new Intent(Intent.ACTION_MAIN); - i.addCategory(Intent.CATEGORY_LAUNCHER); - List resolveInfoList = mPackageManager.queryIntentActivities(i, 0); - - synchronized (mLauncherResolveInfoList) { - mLauncherResolveInfoList.clear(); - for (ResolveInfo ri : resolveInfoList) { - mLauncherResolveInfoList.add(ri.activityInfo.packageName); - } - } - } - - @Override - public void init() { - } - - @Override - public boolean filterApp(ApplicationsState.AppEntry entry) { - boolean show = !mAllPackagesAdapter.mEntries.contains(entry.info.packageName); - if (show) { - synchronized (mLauncherResolveInfoList) { - show = mLauncherResolveInfoList.contains(entry.info.packageName); - } - } - return show; - } - } -} diff --git a/parts/src/org/lineageos/settings/thermal/ThermalUtils.java b/parts/src/org/lineageos/settings/thermal/ThermalUtils.java deleted file mode 100644 index 79510eda..00000000 --- a/parts/src/org/lineageos/settings/thermal/ThermalUtils.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2020 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.thermal; - -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.UserHandle; - -import androidx.preference.PreferenceManager; - -import org.lineageos.settings.utils.FileUtils; - -public final class ThermalUtils { - - protected static final int STATE_DEFAULT = 0; - protected static final int STATE_BENCHMARK = 1; - protected static final int STATE_BROWSER = 2; - protected static final int STATE_CAMERA = 3; - protected static final int STATE_DIALER = 4; - protected static final int STATE_GAMING = 5; - protected static final int STATE_STREAMING = 6; - private static final String THERMAL_CONTROL = "thermal_control"; - private static final String THERMAL_STATE_DEFAULT = "0"; - private static final String THERMAL_STATE_BENCHMARK = "10"; - private static final String THERMAL_STATE_BROWSER = "11"; - private static final String THERMAL_STATE_CAMERA = "12"; - private static final String THERMAL_STATE_DIALER = "8"; - private static final String THERMAL_STATE_GAMING = "9"; - private static final String THERMAL_STATE_STREAMING = "14"; - - private static final String THERMAL_BENCHMARK = "thermal.benchmark="; - private static final String THERMAL_BROWSER = "thermal.browser="; - private static final String THERMAL_CAMERA = "thermal.camera="; - private static final String THERMAL_DIALER = "thermal.dialer="; - private static final String THERMAL_GAMING = "thermal.gaming="; - private static final String THERMAL_STREAMING = "thermal.streaming="; - - private static final String THERMAL_SCONFIG = "/sys/class/thermal/thermal_message/sconfig"; - - private SharedPreferences mSharedPrefs; - - protected ThermalUtils(Context context) { - mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); - } - - public static void startService(Context context) { - if (FileUtils.fileExists(THERMAL_SCONFIG)) { - context.startServiceAsUser(new Intent(context, ThermalService.class), - UserHandle.CURRENT); - } - } - - private void writeValue(String profiles) { - mSharedPrefs.edit().putString(THERMAL_CONTROL, profiles).apply(); - } - - private String getValue() { - String value = mSharedPrefs.getString(THERMAL_CONTROL, null); - - if (value != null) { - String[] modes = value.split(":"); - if (modes.length < 5) value = null; - } - - if (value == null || value.isEmpty()) { - value = THERMAL_BENCHMARK + ":" + THERMAL_BROWSER + ":" + THERMAL_CAMERA + ":" + - THERMAL_DIALER + ":" + THERMAL_GAMING + ":" + THERMAL_STREAMING; - writeValue(value); - } - return value; - } - - protected void writePackage(String packageName, int mode) { - String value = getValue(); - value = value.replace(packageName + ",", ""); - String[] modes = value.split(":"); - String finalString; - - switch (mode) { - case STATE_BENCHMARK: - modes[0] = modes[0] + packageName + ","; - break; - case STATE_BROWSER: - modes[1] = modes[1] + packageName + ","; - break; - case STATE_CAMERA: - modes[2] = modes[2] + packageName + ","; - break; - case STATE_DIALER: - modes[3] = modes[3] + packageName + ","; - break; - case STATE_GAMING: - modes[4] = modes[4] + packageName + ","; - break; - case STATE_STREAMING: - modes[5] = modes[5] + packageName + ","; - break; - } - - finalString = modes[0] + ":" + modes[1] + ":" + modes[2] + ":" + modes[3] + ":" + - modes[4] + ":" + modes[5]; - - writeValue(finalString); - } - - protected int getStateForPackage(String packageName) { - String value = getValue(); - String[] modes = value.split(":"); - int state = STATE_DEFAULT; - if (modes[0].contains(packageName + ",")) { - state = STATE_BENCHMARK; - } else if (modes[1].contains(packageName + ",")) { - state = STATE_BROWSER; - } else if (modes[2].contains(packageName + ",")) { - state = STATE_CAMERA; - } else if (modes[3].contains(packageName + ",")) { - state = STATE_DIALER; - } else if (modes[4].contains(packageName + ",")) { - state = STATE_GAMING; - } else if (modes[5].contains(packageName + ",")) { - state = STATE_STREAMING; - } - - return state; - } - - protected void setDefaultThermalProfile() { - FileUtils.writeLine(THERMAL_SCONFIG, THERMAL_STATE_DEFAULT); - } - - protected void setThermalProfile(String packageName) { - String value = getValue(); - String modes[]; - String state = THERMAL_STATE_DEFAULT; - - if (value != null) { - modes = value.split(":"); - - if (modes[0].contains(packageName + ",")) { - state = THERMAL_STATE_BENCHMARK; - } else if (modes[1].contains(packageName + ",")) { - state = THERMAL_STATE_BROWSER; - } else if (modes[2].contains(packageName + ",")) { - state = THERMAL_STATE_CAMERA; - } else if (modes[3].contains(packageName + ",")) { - state = THERMAL_STATE_DIALER; - } else if (modes[4].contains(packageName + ",")) { - state = THERMAL_STATE_GAMING; - } else if (modes[5].contains(packageName + ",")) { - state = THERMAL_STATE_STREAMING; - } - } - FileUtils.writeLine(THERMAL_SCONFIG, state); - } -} diff --git a/parts/src/org/lineageos/settings/utils/FileUtils.java b/parts/src/org/lineageos/settings/utils/FileUtils.java old mode 100755 new mode 100644 diff --git a/parts/src/org/lineageos/settings/widget/SeekBarPreference.java b/parts/src/org/lineageos/settings/widget/SeekBarPreference.java old mode 100755 new mode 100644