From 52b08e42ba3c88808cd0a387f2bd3d1f612de52d Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Wed, 10 Oct 2018 17:43:06 -0700
Subject: [PATCH] Update toolbar for mobile network settings

Bug: 114749736
Test: Manual
Change-Id: I9b01df83215ca6974b096060fa8d6669307c96e1
---
 res/layout/mobile_settings_container.xml                      | 4 ++--
 .../settings/network/telephony/MobileSettingsActivity.java    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/layout/mobile_settings_container.xml b/res/layout/mobile_settings_container.xml
index d81a72e3b74..c52b362123d 100644
--- a/res/layout/mobile_settings_container.xml
+++ b/res/layout/mobile_settings_container.xml
@@ -24,11 +24,11 @@
 
     <Toolbar
         android:id="@+id/action_bar"
+        style="?android:attr/actionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:navigationContentDescription="@*android:string/action_bar_up_description"
-        android:theme="?android:attr/actionBarTheme"
-        style="?android:attr/actionBarStyle"/>
+        android:theme="?android:attr/actionBarTheme"/>
 
     <FrameLayout
         android:id="@+id/main_content"
diff --git a/src/com/android/settings/network/telephony/MobileSettingsActivity.java b/src/com/android/settings/network/telephony/MobileSettingsActivity.java
index e857871e8b6..920b23d0722 100644
--- a/src/com/android/settings/network/telephony/MobileSettingsActivity.java
+++ b/src/com/android/settings/network/telephony/MobileSettingsActivity.java
@@ -71,6 +71,7 @@ public class MobileSettingsActivity extends SettingsBaseActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.mobile_settings_container);
+        setActionBar(findViewById(R.id.action_bar));
         mSubscriptionManager = getSystemService(SubscriptionManager.class);
         mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
         mCurSubscriptionId = savedInstanceState != null