From bf11e47a1b027d8b7878d468b743964515527f9e Mon Sep 17 00:00:00 2001
From: danielwbhuang <danielwbhuang@google.com>
Date: Thu, 2 Jan 2020 15:59:46 +0800
Subject: [PATCH] Add 5G icon in manual network selection.

Manual network selection need to have 5G icon when 5G signal is
available.

Bug: 143995814
Test: 1. Build pass.
2. check UI:
3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names
3-2. Turn off Automatically select network

Change-Id: I3664105d3bf52e3694a2274c6aa76a755de4e1dd
---
 res/drawable/signal_strength_5g.xml           | 29 +++++++++++++++++++
 .../telephony/NetworkOperatorPreference.java  |  3 ++
 2 files changed, 32 insertions(+)
 create mode 100644 res/drawable/signal_strength_5g.xml

diff --git a/res/drawable/signal_strength_5g.xml b/res/drawable/signal_strength_5g.xml
new file mode 100644
index 00000000000..fdaea7efb2b
--- /dev/null
+++ b/res/drawable/signal_strength_5g.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="9.208dp"
+    android:height="17dp"
+    android:viewportWidth="14.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M13.9,12.24l-0.22,0.27c-0.63,0.73 -1.55,1.1 -2.76,1.1c-1.08,0 -1.92,-0.36 -2.53,-1.07s-0.93,-1.72 -0.94,-3.02V7.56c0,-1.39 0.28,-2.44 0.84,-3.13s1.39,-1.04 2.51,-1.04c0.95,0 1.69,0.26 2.23,0.79s0.83,1.28 0.89,2.26h-1.25c-0.05,-0.62 -0.22,-1.1 -0.52,-1.45s-0.74,-0.52 -1.34,-0.52c-0.72,0 -1.24,0.23 -1.57,0.7S8.72,6.37 8.71,7.4v2.03c0,1 0.19,1.77 0.57,2.31c0.38,0.54 0.93,0.8 1.65,0.8c0.67,0 1.19,-0.16 1.54,-0.49l0.18,-0.17V9.59h-1.82V8.52h3.07V12.24z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M1.15,8.47l0.43,-4.96h4.33v1.17H2.6L2.37,7.39C2.78,7.1 3.22,6.96 3.69,6.96c0.77,0 1.38,0.3 1.83,0.9s0.66,1.41 0.66,2.43c0,1.03 -0.24,1.84 -0.72,2.43S4.32,13.6 3.48,13.6c-0.75,0 -1.36,-0.24 -1.83,-0.73s-0.74,-1.16 -0.81,-2.02h1.13c0.07,0.57 0.23,1 0.49,1.29c0.26,0.29 0.59,0.43 1.01,0.43c0.47,0 0.84,-0.2 1.1,-0.61c0.26,-0.41 0.4,-0.96 0.4,-1.65c0,-0.65 -0.14,-1.18 -0.43,-1.59S3.88,8.09 3.4,8.09c-0.4,0 -0.72,0.1 -0.96,0.31L2.11,8.73L1.15,8.47z"/>
+</vector>
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index db7c8644d8a..29b3374aee6 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -187,6 +187,9 @@ public class NetworkOperatorPreference extends Preference {
             return mShow4GForLTE
                     ? R.drawable.ic_signal_strength_4g : R.drawable.signal_strength_lte;
         }
+        if (ci instanceof CellInfoNr) {
+            return R.drawable.signal_strength_5g;
+        }
         return MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON;
     }