Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff2f2d4 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Update id for Toolbar"

parents 78cc28d9 1fccc048

res/layout/mobile_settings_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/network/telephony/MobileSettingsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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