PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update toolbar for mobile network settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-17 20:20:08 +00:00
committed by Android (Google) Code Review
parent deaded12c7 52b08e42ba
commit 5477ffe081
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/mobile_settings_container.xml
View File

@@ -24,11 +24,11 @@
<Toolbar <Toolbar
android:id="@+id/action_bar" android:id="@+id/action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:navigationContentDescription="@*android:string/action_bar_up_description" android:navigationContentDescription="@*android:string/action_bar_up_description"
android:theme="?android:attr/actionBarTheme" android:theme="?android:attr/actionBarTheme"/>
style="?android:attr/actionBarStyle"/>
<FrameLayout <FrameLayout
android:id="@+id/main_content" android:id="@+id/main_content"

1
src/com/android/settings/network/telephony/MobileSettingsActivity.java
View File

@@ -71,6 +71,7 @@ public class MobileSettingsActivity extends SettingsBaseActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.mobile_settings_container); setContentView(R.layout.mobile_settings_container);
setActionBar(findViewById(R.id.action_bar));
mSubscriptionManager = getSystemService(SubscriptionManager.class); mSubscriptionManager = getSystemService(SubscriptionManager.class);
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(); mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
mCurSubscriptionId = savedInstanceState != null mCurSubscriptionId = savedInstanceState != null