sdm660-common: DeviceSettings/DeviceDoze: change settingslib widget to collapsingtoolbar
device/asus/sdm660-common/DeviceSettings/src/org/lineageos/settings/device/DeviceSettingsActivity.java:24: error: cannot find symbol
import com.android.settingslib.widget.R;
^
symbol: class R
location: package com.android.settingslib.widget
device/asus/sdm660-common/DeviceSettings/src/org/lineageos/settings/device/kcal/KCalSettingsActivity.java:26: error: cannot find symbol
import com.android.settingslib.widget.R;
^
symbol: class R
location: package com.android.settingslib.widget
device/asus/sdm660-common/DeviceSettings/src/org/lineageos/settings/device/speaker/ClearSpeakerActivity.java:24: error: cannot find symbol
import com.android.settingslib.widget.R;
^
symbol: class R
location: package com.android.settingslib.widget
26ffac3b24
This commit is contained in:
parent
93e4d5250f
commit
9b4e398620
5 changed files with 14 additions and 19 deletions
|
@ -19,7 +19,6 @@ import android.os.Bundle;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
||||||
import com.android.settingslib.widget.R;
|
|
||||||
|
|
||||||
public class BMSActivity extends CollapsingToolbarBaseActivity {
|
public class BMSActivity extends CollapsingToolbarBaseActivity {
|
||||||
|
|
||||||
|
@ -27,11 +26,11 @@ public class BMSActivity extends CollapsingToolbarBaseActivity {
|
||||||
protected void onCreate(Bundle bundle) {
|
protected void onCreate(Bundle bundle) {
|
||||||
super.onCreate(bundle);
|
super.onCreate(bundle);
|
||||||
|
|
||||||
Fragment fragment = getFragmentManager().findFragmentById(R.id.content_frame);
|
Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.content_frame);
|
||||||
BMSFragment bmsFragment;
|
BMSFragment bmsFragment;
|
||||||
if (fragment == null) {
|
if (fragment == null) {
|
||||||
bmsFragment = new BMSFragment();
|
bmsFragment = new BMSFragment();
|
||||||
getFragmentManager().beginTransaction().add(R.id.content_frame, bmsFragment).commit();
|
getFragmentManager().beginTransaction().add(com.android.settingslib.collapsingtoolbar.R.id.content_frame, bmsFragment).commit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -20,7 +20,6 @@ package com.advanced.settings.doze;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
||||||
import com.android.settingslib.widget.R;
|
|
||||||
|
|
||||||
public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
|
public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
|
||||||
|
|
||||||
|
@ -30,7 +29,7 @@ public class DozeSettingsActivity extends CollapsingToolbarBaseActivity {
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
getFragmentManager().beginTransaction().replace(R.id.content_frame,
|
getFragmentManager().beginTransaction().replace(com.android.settingslib.collapsingtoolbar.R.id.content_frame,
|
||||||
new DozeSettingsFragment(), TAG_DOZE).commit();
|
new DozeSettingsFragment(), TAG_DOZE).commit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,6 @@ import android.os.Bundle;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
||||||
import com.android.settingslib.widget.R;
|
|
||||||
|
|
||||||
public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
|
public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
|
||||||
|
|
||||||
|
@ -31,11 +30,11 @@ public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
Fragment fragment = getFragmentManager().findFragmentById(R.id.content_frame);
|
Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.content_frame);
|
||||||
if (fragment == null) {
|
if (fragment == null) {
|
||||||
deviceSettingsFragment = new DeviceSettings();
|
deviceSettingsFragment = new DeviceSettings();
|
||||||
getFragmentManager().beginTransaction()
|
getFragmentManager().beginTransaction()
|
||||||
.add(R.id.content_frame, deviceSettingsFragment)
|
.add(com.android.settingslib.collapsingtoolbar.R.id.content_frame, deviceSettingsFragment)
|
||||||
.commit();
|
.commit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,6 @@ import android.view.MenuInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
||||||
import com.android.settingslib.widget.R;
|
|
||||||
|
|
||||||
public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implements Utils {
|
public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implements Utils {
|
||||||
|
|
||||||
|
@ -32,13 +31,13 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_kcal);
|
setContentView(com.android.settingslib.collapsingtoolbar.R.layout.activity_kcal);
|
||||||
|
|
||||||
Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_kcal);
|
Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.fragment_kcal);
|
||||||
if (fragment == null) {
|
if (fragment == null) {
|
||||||
mKCalSettingsFragment = new KCalSettings();
|
mKCalSettingsFragment = new KCalSettings();
|
||||||
getFragmentManager().beginTransaction()
|
getFragmentManager().beginTransaction()
|
||||||
.add(R.id.fragment_kcal, mKCalSettingsFragment)
|
.add(com.android.settingslib.collapsingtoolbar.R.id.fragment_kcal, mKCalSettingsFragment)
|
||||||
.commit();
|
.commit();
|
||||||
} else {
|
} else {
|
||||||
mKCalSettingsFragment = (KCalSettings) fragment;
|
mKCalSettingsFragment = (KCalSettings) fragment;
|
||||||
|
@ -52,7 +51,7 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
|
||||||
finish();
|
finish();
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_reset:
|
case com.android.settingslib.collapsingtoolbar.R.id.action_reset:
|
||||||
mKCalSettingsFragment.applyValues(RED_DEFAULT + " " +
|
mKCalSettingsFragment.applyValues(RED_DEFAULT + " " +
|
||||||
GREEN_DEFAULT + " " +
|
GREEN_DEFAULT + " " +
|
||||||
BLUE_DEFAULT + " " +
|
BLUE_DEFAULT + " " +
|
||||||
|
@ -65,7 +64,7 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
|
||||||
mKCalSettingsFragment.setmSetOnBoot(SETONBOOT_DEFAULT);
|
mKCalSettingsFragment.setmSetOnBoot(SETONBOOT_DEFAULT);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_preset:
|
case com.android.settingslib.collapsingtoolbar.R.id.action_preset:
|
||||||
new PresetDialog().show(getFragmentManager(),
|
new PresetDialog().show(getFragmentManager(),
|
||||||
KCalSettingsActivity.class.getName(), mKCalSettingsFragment);
|
KCalSettingsActivity.class.getName(), mKCalSettingsFragment);
|
||||||
return true;
|
return true;
|
||||||
|
@ -79,7 +78,7 @@ public class KCalSettingsActivity extends CollapsingToolbarBaseActivity implemen
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
MenuInflater menuInflater = getMenuInflater();
|
MenuInflater menuInflater = getMenuInflater();
|
||||||
menuInflater.inflate(R.menu.menu_reset, menu);
|
menuInflater.inflate(com.android.settingslib.collapsingtoolbar.R.menu.menu_reset, menu);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,6 @@ import android.os.Bundle;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
|
||||||
import com.android.settingslib.widget.R;
|
|
||||||
|
|
||||||
public class ClearSpeakerActivity extends CollapsingToolbarBaseActivity {
|
public class ClearSpeakerActivity extends CollapsingToolbarBaseActivity {
|
||||||
|
|
||||||
|
@ -32,11 +31,11 @@ public class ClearSpeakerActivity extends CollapsingToolbarBaseActivity {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
|
||||||
Fragment fragment = getFragmentManager().findFragmentById(R.id.content_frame);
|
Fragment fragment = getFragmentManager().findFragmentById(com.android.settingslib.collapsingtoolbar.R.id.content_frame);
|
||||||
if (fragment == null) {
|
if (fragment == null) {
|
||||||
clearSpeakerFragment = new ClearSpeakerFragment();
|
clearSpeakerFragment = new ClearSpeakerFragment();
|
||||||
getFragmentManager().beginTransaction()
|
getFragmentManager().beginTransaction()
|
||||||
.add(R.id.content_frame, clearSpeakerFragment)
|
.add(com.android.settingslib.collapsingtoolbar.R.id.content_frame, clearSpeakerFragment)
|
||||||
.commit();
|
.commit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue