commit 359d1ab5cf0485694a3af131661e42ff8897c0eb
author Malcolm Chen <refuhoo@google.com> Wed Aug 16 17:30:45 2017 -0700
committer Xiangyu/Malcolm Chen <refuhoo@google.com> Thu Aug 17 00:37:55 2017 +0000
tree 151e9c730e000327a8d8ed995110e711d6631bbc
parent 7230eb8e50e5acdd7f92c700325eab1ba16ac6bd

Show back arrow when opening activities from mobile setting page.

Add extra "show_drawer_menu" as true when sending intent to open
other activities like "Wi-Fi calling" and "Data usage". So that
the opened activity shows back arrow in action bar.

Bug: 64770204
Test: manual
Change-Id: I595b48bd059c106e2f2a6c21326d295caae69c50

res/xml/call_feature_setting.xml

diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 72be17c..5eb28fb 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -42,7 +42,9 @@
 
         <intent android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity"/>
+            android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
+                <extra android:name="show_drawer_menu" android:value="true" />
+        </intent>
 
     </PreferenceScreen>
 

res/xml/network_setting_fragment.xml

diff --git a/res/xml/network_setting_fragment.xml b/res/xml/network_setting_fragment.xml
index 106d3cb..a4c115d 100644
--- a/res/xml/network_setting_fragment.xml
+++ b/res/xml/network_setting_fragment.xml
@@ -76,7 +76,9 @@
 
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity"/>
+                    android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
+                        <extra android:name="show_drawer_menu" android:value="true" />
+            </intent>
 
         </PreferenceScreen>
 

src/com/android/phone/DataUsagePreference.java

diff --git a/src/com/android/phone/DataUsagePreference.java b/src/com/android/phone/DataUsagePreference.java
index 174ff6a..85e7700 100644
--- a/src/com/android/phone/DataUsagePreference.java
+++ b/src/com/android/phone/DataUsagePreference.java
@@ -20,13 +20,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.NetworkTemplate;
-import android.os.Bundle;
 import android.preference.Preference;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.format.Formatter;
 import android.util.AttributeSet;
 
+import com.android.settingslib.drawer.SettingsDrawerActivity;
 import com.android.settingslib.net.DataUsageController;
 
 /**
@@ -62,8 +62,8 @@
 
     @Override
     public Intent getIntent() {
-        Bundle args = new Bundle();
         Intent intent = new Intent(Settings.ACTION_MOBILE_DATA_USAGE);
+        intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
 
         intent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mTemplate);
         intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);