Snap for 7860154 from f7a64ad34c59b2532a02e6310890cc91054e0f1d to tm-release

Change-Id: I994b8f82de0897a6f5cc517fcf68994b21aae5b6

overlay/frameworks/base/core/res/res/values/config.xml

@@ -103,8 +103,10 @@
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">25px</dimen>
 
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height_portrait">28dp</dimen>
+    <!-- Height of the status bar.
+         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+         -->
+    <dimen name="status_bar_height">28dp</dimen>
 
     <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
     <dimen name="quick_qs_offset_height">171px</dimen>

uwb/calibration/UWB-calibration-pk.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-pk.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-py.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-py.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-ru.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-ru.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-sb.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-sb.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-tj.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-tj.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-tm.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-tm.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-tw.conf.r4

@@ -1,2 +0,0 @@
-alternate_pulse_shape=0x01
-restricted_channels=0x20

uwb/calibration/UWB-calibration-ua.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-ua.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-uz.conf.p7

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration-uz.conf.r4

@@ -1 +0,0 @@
-restricted_channels=0xffff

uwb/calibration/UWB-calibration.conf.raven

@@ -1,116 +0,0 @@
-[CCC]format=1
-[CCC]kind=0
-[CCC]settings=1
-[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
-[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
-[CCC]ant0.ch5.prf64.pdoa_offset=0
-[CCC]ant0.ch9.prf64.pdoa_offset=0
-[CCC]ant0.ch5.prf64.pll_locking_code=0
-[CCC]ant0.ch9.prf64.pll_locking_code=0
-[CCC]id=0
-[CCC]wifi_coex_time_gap=10
-[CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
-ant0.ch5.prf16.ant_delay=16450
-ant0.ch5.prf16.tx_power=0x4E4E4E4E
-ant0.ch5.prf16.pg_count=0
-ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16450
-ant0.ch5.prf64.tx_power=0x4E4E4E4E
-ant0.ch5.prf64.pg_count=0
-ant0.ch5.prf64.pg_delay=0x26
-ant0.ch9.prf16.ant_delay=16450
-ant0.ch9.prf16.tx_power=0x56565656
-ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16450
-ant0.ch9.prf64.tx_power=0x56565656
-ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x26
-ant0.port=0
-ant0.selector_gpio=7
-ant0.selector_gpio_value=0
-ant1.ch5.prf16.ant_delay=16450
-ant1.ch5.prf16.tx_power=0x4E4E4E4E
-ant1.ch5.prf16.pg_count=0
-ant1.ch5.prf16.pg_delay=0x26
-ant1.ch5.prf64.ant_delay=16450
-ant1.ch5.prf64.tx_power=0x4E4E4E4E
-ant1.ch5.prf64.pg_count=0
-ant1.ch5.prf64.pg_delay=0x26
-ant1.ch9.prf16.ant_delay=16450
-ant1.ch9.prf16.tx_power=0x56565656
-ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.ant_delay=16450
-ant1.ch9.prf64.tx_power=0x56565656
-ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x26
-ant1.port=0
-ant1.selector_gpio=7
-ant1.selector_gpio_value=1
-ant2.ch5.prf16.ant_delay=16450
-ant2.ch5.prf16.tx_power=0x4E4E4E4E
-ant2.ch5.prf16.pg_count=0
-ant2.ch5.prf16.pg_delay=0x26
-ant2.ch5.prf64.ant_delay=16450
-ant2.ch5.prf64.tx_power=0x4E4E4E4E
-ant2.ch5.prf64.pg_count=0
-ant2.ch5.prf64.pg_delay=0x26
-ant2.ch9.prf16.ant_delay=16450
-ant2.ch9.prf16.tx_power=0x56565656
-ant2.ch9.prf16.pg_count=0
-ant2.ch9.prf16.pg_delay=0x26
-ant2.ch9.prf64.ant_delay=16450
-ant2.ch9.prf64.tx_power=0x56565656
-ant2.ch9.prf64.pg_count=0
-ant2.ch9.prf64.pg_delay=0x26
-ant2.port=1
-ant2.selector_gpio=6
-ant2.selector_gpio_value=0
-ant3.ch5.prf16.ant_delay=16450
-ant3.ch5.prf16.tx_power=0x4E4E4E4E
-ant3.ch5.prf16.pg_count=0
-ant3.ch5.prf16.pg_delay=0x26
-ant3.ch5.prf64.ant_delay=16450
-ant3.ch5.prf64.tx_power=0x4E4E4E4E
-ant3.ch5.prf64.pg_count=0
-ant3.ch5.prf64.pg_delay=0x26
-ant3.ch9.prf16.ant_delay=16450
-ant3.ch9.prf16.tx_power=0x56565656
-ant3.ch9.prf16.pg_count=0
-ant3.ch9.prf16.pg_delay=0x26
-ant3.ch9.prf64.ant_delay=16450
-ant3.ch9.prf64.tx_power=0x56565656
-ant3.ch9.prf64.pg_count=0
-ant3.ch9.prf64.pg_delay=0x26
-ant3.port=1
-ant3.selector_gpio=6
-ant3.selector_gpio_value=1
-ant0.ant1.ch5.pdoa_offset=0
-ant0.ant1.ch9.pdoa_offset=0
-ant0.ant2.ch5.pdoa_offset=0
-ant0.ant2.ch9.pdoa_offset=0
-ant1.ant2.ch5.pdoa_offset=0
-ant1.ant2.ch9.pdoa_offset=0
-ant0.ant3.ch5.pdoa_offset=0
-ant0.ant3.ch9.pdoa_offset=0
-ant1.ant3.ch5.pdoa_offset=-4710
-ant1.ant3.ch9.pdoa_offset=-6144
-ant2.ant3.ch5.pdoa_offset=0
-ant2.ant3.ch9.pdoa_offset=0
-ch5.pll_locking_code=0
-ch9.pll_locking_code=0
-ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a
-ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a
-xtal_trim=31
-temperature_reference=85
-smart_tx_power=1
-auto_sleep_margin=20000
-[HAL]antenna_pair_azimuth=4
-[HAL]antenna_pair_elevation=4
-[HAL]tx_antenna=0
-[HAL]minimum_system_offset_uwbtime0=200
-restricted_channels=0

uwb/calibration/country_conf_gen.sh

@@ -15,25 +15,17 @@ while read line ; do
         country[count]=$(echo $line | cut -d ':' -f1)
         code[count]=$(echo $line | cut -d ':' -f2 | tr -d " ")
 
-        for var in ${project[@]}; do
             if [ "$header" = "restricted_channels=0x20" ]; then
-                echo "alternate_pulse_shape=0x01" > UWB-calibration-${code[$count]}.conf.$var
-                echo "$header" >> UWB-calibration-${code[$count]}.conf.$var
+                echo "alternate_pulse_shape=0x01" > UWB-calibration-${code[$count]}.conf
+                echo "$header" >> UWB-calibration-${code[$count]}.conf
             else
-            echo "$header" > UWB-calibration-${code[$count]}.conf.$var
+            echo "$header" > UWB-calibration-${code[$count]}.conf
             fi
-        done
     fi
 ((count++))
 done < uwb_country.conf
 
-for var in ${project[@]}; do
     echo "==============  $var  =============="
     for var2 in ${code[@]}; do
-        if [ "$var2" = "${code[-1]}" ]; then
-            echo "\$(LOCAL_UWB_CAL_DIR)/UWB-calibration-$var2.conf.$var:\$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-$var2.conf"
-        else
-            echo "\$(LOCAL_UWB_CAL_DIR)/UWB-calibration-$var2.conf.$var:\$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-$var2.conf \\"
-        fi
+            echo "\$(LOCAL_UWB_CAL_DIR)/UWB-calibration-$var2.conf:\$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-$var2.conf \\"
     done
-done