Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e18d19f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0-00005. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1046815   I7b1aea8a9a472a0e9bbea4123dbd86c311fb9483   Alarm:Fix issue exchange account disapper after power of
1039313   Ie93755394d617d45fd46cb624dd0ce88074e645e   SystemUi changes submit
1054211   I7054328fa3787359411668e5c0e4a459eeed7136   Synchronize access of mSubscriptions and fix NPE
1058646   I853a1c270e3a63e96199ac43f7fa93c5f8eefb87   SystemUI: Fix systemui FC issue
1051582   I9d70f8497159bcf10e1678e4936216af328d9774   Remove vulkan specific features from feature list if not
1056256   Ia1ee33ba22d6ccb5ac1a0297248f16d4c8d80c8c   Bluetooth: Use correct previous state while moving to ST
1058669   I02bca7373fad1be5bf16bf7d37282940783fb436   Revert "Add Radio Tech support when search PLMN"
1039259   I0f71e223e63b1e03faa402f7e70622297cfaff14   SettingProvider: add default values for show password
1061505   I301ce7604fabdf64cfab90639e486bfd95bd8bf9   SystemUI: Fix Signal Level Incorrect issue

Change-Id: Ic3a8cdd11906c7f8dfe357fddf8b0055566b824d
CRs-Fixed: 1054211, 1056256, 1058646, 1039313, 1039259, 1046815, 1051582, 1061505, 1058669
parents ad55778b ecf7fd34

core/java/com/android/server/SystemConfig.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager; 
import android.os.Environment;

import android.os.Process;

import android.os.storage.StorageManager;

import android.os.SystemProperties;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Slog;
@@ -201,6 +202,11 @@ public class SystemConfig { 
                Environment.getOemDirectory(), "etc", "sysconfig"), ALLOW_FEATURES);

        readPermissions(Environment.buildPath(

                Environment.getOemDirectory(), "etc", "permissions"), ALLOW_FEATURES);

        //Remove vulkan specific features

        if (SystemProperties.getBoolean("persist.graphics.vulkan.disable", false)) {

            removeFeature(PackageManager.FEATURE_VULKAN_HARDWARE_LEVEL);

            removeFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION);

        }

    }



    void readPermissions(File libraryDir, int permissionFlag) {

packages/SettingsProvider/res/values/defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ 
    <bool name="def_netstats_enabled">true</bool>

    <bool name="def_usb_mass_storage_enabled">true</bool>

    <bool name="def_wifi_on">false</bool>

    <bool name="def_show_password_on">true</bool>

    <bool name="config_show_password_on">false</bool>

    <!-- 0 == never, 1 == only when plugged in, 2 == always -->

    <integer name="def_wifi_sleep_policy">2</integer>

    <bool name="def_networks_available_notification_on">true</bool>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+8 −0
Original line number Diff line number Diff line
@@ -2391,6 +2391,14 @@ class DatabaseHelper extends SQLiteOpenHelper { 
            loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE,

                    R.bool.def_notification_pulse);



            final boolean isShowPassword =

                    mContext.getResources().getBoolean(R.bool.config_show_password_on);

            if (isShowPassword) {

                loadBooleanSetting(stmt, Settings.System.TEXT_SHOW_PASSWORD,

                        R.bool.def_show_password_on);

            }





            loadUISoundEffectsSettings(stmt);



            loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,

packages/SystemUI/res/drawable/ic_qs_signal_3g_plus.xml

0 → 100644
+69 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (c) 2015, The Linux Foundation. All rights reserved.



  Redistribution and use in source and binary forms, with or without

  modification, are permitted provided that the following conditions are

  met:

      * Redistributions of source code must retain the above copyright

        notice, this list of conditions and the following disclaimer.

      * Redistributions in binary form must reproduce the above

        copyright notice, this list of conditions and the following

        disclaimer in the documentation and/or other materials provided

        with the distribution.

      * Neither the name of The Linux Foundation nor the names of its

        contributors may be used to endorse or promote products derived

        from this software without specific prior written permission.



  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="30dp"

    android:height="27dp"

    android:viewportWidth="30"

    android:viewportHeight="27">



    <path

        android:fillColor="#FFFFFF"

        android:pathData="M4.306,7.479h1.003c0.381,0,0.66-0.133,0.84-0.398c0.178-0.267,0.267-0.622,0.267-1.066

c0-0.195-0.021-0.374-0.062-0.538C6.311,5.313,6.248,5.172,6.162,5.052C6.076,4.933,5.971,4.838,5.844,4.77

C5.717,4.702,5.57,4.667,5.404,4.667c-0.132,0-0.258,0.027-0.377,0.081C4.907,4.802,4.804,4.88,4.716,4.982

C4.628,5.084,4.557,5.209,4.504,5.355C4.449,5.502,4.423,5.668,4.423,5.854H2.35c0-0.439,0.078-0.838,0.234-1.197

C2.74,4.298,2.953,3.992,3.222,3.741C3.49,3.489,3.807,3.294,4.17,3.155c0.363-0.14,0.756-0.209,1.176-0.209

c0.464,0,0.889,0.064,1.274,0.194c0.386,0.13,0.716,0.323,0.993,0.579c0.275,0.257,0.49,0.574,0.645,0.952

c0.152,0.379,0.23,0.816,0.23,1.314c0,0.234-0.031,0.463-0.092,0.686c-0.062,0.222-0.15,0.432-0.268,0.63

C8.012,7.498,7.869,7.682,7.701,7.85c-0.17,0.169-0.363,0.312-0.583,0.429c0.503,0.215,0.878,0.537,1.124,0.967

c0.246,0.43,0.37,0.938,0.37,1.523c0,0.498-0.085,0.942-0.253,1.333s-0.398,0.719-0.691,0.985s-0.641,0.469-1.041,0.607

c-0.4,0.14-0.832,0.209-1.296,0.209c-0.391,0-0.771-0.062-1.14-0.184c-0.368-0.122-0.695-0.31-0.98-0.563

c-0.285-0.253-0.517-0.572-0.692-0.956c-0.176-0.383-0.264-0.839-0.264-1.366h2.073c0,0.195,0.026,0.375,0.08,0.539

c0.054,0.163,0.127,0.305,0.22,0.425c0.093,0.119,0.204,0.213,0.333,0.281c0.129,0.068,0.272,0.103,0.429,0.103

c0.181,0,0.342-0.034,0.483-0.103c0.141-0.069,0.262-0.166,0.363-0.293c0.1-0.127,0.176-0.279,0.23-0.457

c0.053-0.179,0.08-0.378,0.08-0.598c0-0.562-0.109-0.965-0.326-1.212c-0.217-0.246-0.521-0.37-0.912-0.37H4.306V7.479z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M17.459,12.548c-0.111,0.122-0.264,0.262-0.453,0.418c-0.191,0.156-0.428,0.304-0.715,0.443

c-0.285,0.139-0.621,0.256-1.006,0.352c-0.387,0.095-0.83,0.143-1.334,0.143c-0.596,0-1.133-0.093-1.611-0.278

s-0.889-0.467-1.23-0.843c-0.341-0.376-0.604-0.851-0.787-1.424c-0.184-0.574-0.274-1.249-0.274-2.025V7.531

c0-0.776,0.088-1.451,0.264-2.025c0.176-0.573,0.426-1.051,0.751-1.432c0.324-0.381,0.72-0.664,1.186-0.85

c0.467-0.186,0.99-0.278,1.572-0.278c0.605,0,1.127,0.075,1.566,0.227c0.439,0.152,0.807,0.378,1.1,0.678

c0.293,0.301,0.518,0.672,0.674,1.113c0.156,0.442,0.256,0.951,0.299,1.527h-2.094c-0.029-0.337-0.076-0.618-0.143-0.843

s-0.159-0.403-0.279-0.538c-0.119-0.134-0.266-0.23-0.439-0.289c-0.173-0.059-0.379-0.088-0.618-0.088

c-0.283,0-0.53,0.05-0.739,0.15c-0.211,0.1-0.385,0.261-0.523,0.483c-0.141,0.222-0.244,0.51-0.313,0.864

c-0.068,0.354-0.102,0.782-0.102,1.285v1.816c0,0.508,0.037,0.938,0.113,1.289c0.075,0.352,0.189,0.639,0.344,0.86

c0.154,0.223,0.348,0.384,0.582,0.483c0.234,0.101,0.511,0.15,0.828,0.15c0.19,0,0.353-0.015,0.486-0.044

c0.135-0.029,0.25-0.064,0.346-0.106c0.094-0.041,0.172-0.084,0.234-0.128c0.061-0.044,0.113-0.081,0.156-0.11V9.772h-1.508V8.146

h3.668L17.459,12.548L17.459,12.548z" />

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M25.234,7.498h2.969v1.734h-2.969v3.383h-1.844V9.232h-2.984V7.498h2.984V4.334h1.844V7.498z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_qs_signal_4g_lte.xml

0 → 100644
+59 −0
Original line number Diff line number Diff line 
<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.



     Redistribution and use in source and binary forms, with or without

     modification, are permitted provided that the following conditions are

     met:

         * Redistributions of source code must retain the above copyright

           notice, this list of conditions and the following disclaimer.

         * Redistributions in binary form must reproduce the above

           copyright notice, this list of conditions and the following

           disclaimer in the documentation and/or other materials provided

           with the distribution.

         * Neither the name of The Linux Foundation nor the names of its

           contributors may be used to endorse or promote products derived

           from this software without specific prior written permission.



     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

     ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="8dp"

    android:height="12dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#ffffff"

        android:pathData="M 9.731,10.4 h 1.349 v 1.437 H 9.731 v 2.37 H 7.956 v -2.37 H 3.49 L

3.446,10.744 7.905,3.53 h 1.826 v 6.87 z m -4.547,0 H 7.956 V 6.044 L

7.912,6.038 7.744,6.448 5.184,10.4 z" />

    <path

        android:fillColor="#ffffff"

        android:pathData="M 20.454,12.763 c -0.295,0.414 -0.762,0.785 -1.405,1.11 -0.642,0.326

-1.472,0.487 -2.49,0.487 -1.259,0 -2.299,-0.406 -3.111,-1.22 -0.815,-0.814

-1.222,-1.867 -1.222,-3.157 v -2.23 c 0,-1.291 0.396,-2.343 1.182,-3.157

0.786,-0.814 1.799,-1.221 3.033,-1.221 1.245,0 2.212,0.312 2.905,0.938

0.695,0.626 1.032,1.442 1.012,2.45 l -0.021,0.043 h -1.694 c 0,-0.601

-0.187,-1.085 -0.561,-1.452 -0.375,-0.367 -0.91,-0.55 -1.61,-0.55 -0.739,0

-1.333,0.276 -1.786,0.829 -0.451,0.553 -0.676,1.254 -0.676,2.104 v 2.245 c

0,0.859 0.234,1.567 0.708,2.123 0.469,0.554 1.086,0.832 1.842,0.832 0.573,0

1.024,-0.065 1.357,-0.195 0.331,-0.129 0.584,-0.287 0.754,-0.473 V 10.062 H

16.436 V 8.729 h 4.02 v 4.034 z" />

    <path

        android:fillColor="#ffffff"

        android:pathData="M 17.328,14.854 H 6.574 c -1.904,0 -3.448,1.513 -3.448,3.379 0,1.866 1.544,3.379

3.448,3.379 h 10.754 c 1.904,0 3.447,-1.513 3.447,-3.379 0,-1.866 -1.543,-3.379

-3.447,-3.379 z M 6.399,15.538 H 7.65 v 4.427 h 2.313 v 0.962 H 6.399 M

13.623,16.5 h -1.424 v 4.427 H 10.948 V 16.5 H 9.549 v -0.962 h 4.074 V 16.5 z m

4.038,0 h -2.279 v 1.159 h 1.898 v 0.962 h -1.898 v 1.344 h 2.275 v 0.962 h

-3.526 v -5.389 h 3.53 V 16.5 z" />

</vector>