From 1fccc048f554c1a4eec269203f8048f21e13e84e Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Thu, 18 Oct 2018 13:54:01 -0700
Subject: [PATCH] Update id for Toolbar

If you use action_bar, it will show blank action bar.

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

diff --git a/res/layout/mobile_settings_container.xml b/res/layout/mobile_settings_container.xml
index c52b362123d..c88b512f443 100644
--- a/res/layout/mobile_settings_container.xml
+++ b/res/layout/mobile_settings_container.xml
@@ -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"
diff --git a/src/com/android/settings/network/telephony/MobileSettingsActivity.java b/src/com/android/settings/network/telephony/MobileSettingsActivity.java
index 920b23d0722..ec740c91109 100644
--- a/src/com/android/settings/network/telephony/MobileSettingsActivity.java
+++ b/src/com/android/settings/network/telephony/MobileSettingsActivity.java
@@ -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