Merge "Update id for Toolbar"

This commit is contained in:
Lei Yu
2018-10-19 01:59:33 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -23,7 +23,7 @@
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
android:id="@+id/mobile_action_bar"
style="?android:attr/actionBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

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