PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ib497aca6,Ic6def54a into pi-dev

Browse Source 
am: 5e8a0e2436

Change-Id: Iaf656a0a6600e5907a7272b1c6e12e2b3a58fd06
This commit is contained in:
Lei Yu
2018-04-02 21:24:24 +00:00
committed by android-build-merger
parent 3903f787e9 5e8a0e2436
commit fc6f4e05da
8 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/ids.xml
View File

@@ -18,9 +18,6 @@
-->
<resources>
<item type="id" name="preference_highlighted" />
<item type="id" name="job_anomaly_clean_up" />
<item type="id" name="job_anomaly_config_update"/>
<item type="id" name="job_anomaly_detection" />
<item type="id" name="lock_none" />
<item type="id" name="lock_pin" />

22
res/values/integers.xml Normal file
View File

@@ -0,0 +1,22 @@
<?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.
-->
<resources>
<!-- Reserve all the job ids in settings -->
<integer name="job_anomaly_clean_up">100</integer>
<integer name="job_anomaly_config_update">101</integer>
<integer name="job_anomaly_detection">102</integer>
</resources>