PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e3e1961f5eb8e98398475610cbc418356c6850e7
app_Settings/res
History
Mark Salyzyn 87a3c6fee7 resolve merge conflicts of 94ab88228e to master. 
NB: packages/apps/Settings/res/values/arrays.xml new content
moves to frameworks/base/packages/SettingsLib/res/values/arrays.xml.

Bug: 26178938
Change-Id: Ib241baac7807914447d84b921994440bf627df29
2015-12-28 11:20:58 -08:00
..
anim
Animations/success state for external confirm device credentials (2/2)
2015-06-10 15:17:24 -07:00
color
[Fingerprint] Use accent color for fingerprint highlight
2015-07-14 01:22:38 +00:00
drawable
Fix the build
2015-12-17 11:37:26 -05:00
drawable-hdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-ldrtl-hdpi
…
drawable-ldrtl-mdpi
…
drawable-ldrtl-xhdpi
…
drawable-mdpi
Merge "Add contactless symbol to NFC resources." into mnc-dev
2015-07-29 13:21:40 +00:00
drawable-nodpi
Refine fingerprint enrollment experience
2015-06-11 15:13:56 -07:00
drawable-sw600dp-hdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-sw600dp-mdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-sw600dp-xhdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-sw600dp-xxhdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-sw600dp-xxxhdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-xhdpi
Merge "Add contactless symbol to NFC resources." into mnc-dev
2015-07-29 13:21:40 +00:00
drawable-xxhdpi
Merge "Add contactless symbol to NFC resources." into mnc-dev
2015-07-29 13:21:40 +00:00
drawable-xxxhdpi
Merge "Add contactless symbol to NFC resources." into mnc-dev
2015-07-29 13:21:40 +00:00
interpolator
Add animation for fingerprint icon
2015-04-28 19:20:59 +00:00
layout
Merge "Use new getIcon and getMoreInfo api to show more information in Print Settings"
2015-12-22 21:49:29 +00:00
layout-land
Fix settings crashes on larger devices
2015-11-18 12:58:07 -05:00
layout-sw600dp
Fix settings crashes on larger devices
2015-11-18 12:58:07 -05:00
layout-sw600dp-land
[Setup] Use SetupWizardLayout
2015-04-21 10:19:35 -07:00
layout-sw720dp
…
menu
Split Sound & notification settings.
2015-11-30 11:21:41 -05:00
mipmap-hdpi
…
mipmap-mdpi
…
mipmap-xhdpi
…
mipmap-xxhdpi
…
mipmap-xxxhdpi
…
raw
Allow animation movie for "find the sensor" flow
2015-12-14 17:19:27 -08:00
values
Settings: Add option to disable logging
2015-12-22 15:14:56 -08:00
values-af
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-af-nokeys
…
values-am
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-am-nokeys
…
values-ar
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ar-nokeys
…
values-az-nokeys
…
values-az-rAZ
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-az-rAZ-nokeys
…
values-be-nokeys
…
values-bg
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-bg-nokeys
…
values-bn-rBD
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-bn-rBD-nokeys
…
values-ca
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ca-nokeys
…
values-cs
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-cs-nokeys
…
values-da
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-da-nokeys
…
values-de
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-de-nokeys
…
values-el
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-el-nokeys
…
values-en-rAU
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-en-rAU-nokeys
…
values-en-rGB
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-en-rGB-nokeys
…
values-en-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-en-rIN-nokeys
…
values-es
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-es-nokeys
…
values-es-rUS
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-es-rUS-nokeys
…
values-et-nokeys
…
values-et-rEE
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-et-rEE-nokeys
…
values-eu-rES
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-eu-rES-nokeys
…
values-fa
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-fa-nokeys
…
values-fi
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-fi-nokeys
…
values-fr
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-fr-nokeys
…
values-fr-rCA
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-fr-rCA-nokeys
…
values-gl-rES
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-gl-rES-nokeys
…
values-gu-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-gu-rIN-nokeys
Import translations. DO NOT MERGE
2015-05-13 21:12:10 -07:00
values-h330dp
…
values-h480dp
…
values-hi
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-hi-nokeys
…
values-hr
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-hr-nokeys
…
values-hu
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-hu-nokeys
…
values-hy-nokeys
…
values-hy-rAM
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-hy-rAM-nokeys
…
values-in
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-in-nokeys
…
values-is-rIS
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-is-rIS-nokeys
…
values-it
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-it-nokeys
…
values-iw
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-iw-nokeys
…
values-ja
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ja-nokeys
…
values-ka-nokeys
…
values-ka-rGE
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ka-rGE-nokeys
…
values-kk-rKZ
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-kk-rKZ-nokeys
…
values-km-nokeys
…
values-km-rKH
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-km-rKH-nokeys
…
values-kn-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-kn-rIN-nokeys
…
values-ko
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ko-nokeys
…
values-ky-rKG
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-land
Implement Settings UI for Screen zoom preference
2015-12-10 14:07:51 -05:00
values-lo-nokeys
…
values-lo-rLA
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-lo-rLA-nokeys
…
values-lt
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-lt-nokeys
…
values-lv
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-lv-nokeys
…
values-mcc001-mnc01
…
values-mcc001-mnc010
…
values-mcc246-mnc081
…
values-mcc310-mnc028
…
values-mcc311-mnc390
…
values-mcc505
To hide none security option, use config_hide_none_security_option config
2015-09-02 13:51:44 -07:00
values-mk-rMK
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-mk-rMK-nokeys
…
values-ml-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ml-rIN-nokeys
…
values-mn-nokeys
…
values-mn-rMN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-mn-rMN-nokeys
…
values-mr-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-mr-rIN-nokeys
…
values-ms-nokeys
…
values-ms-rMY
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ms-rMY-nokeys
…
values-my-rMM
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-my-rMM-nokeys
…
values-nb
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-nb-nokeys
…
values-ne-nokeys
…
values-ne-rNP
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ne-rNP-nokeys
…
values-night
RIP -night DO NOT MERGE
2015-06-17 09:17:31 -04:00
values-nl
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-nl-nokeys
…
values-nokeys
…
values-pa-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-pa-rIN-nokeys
Import translations. DO NOT MERGE
2015-04-25 00:12:23 -07:00
values-pl
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-pl-nokeys
…
values-pt
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-pt-nokeys
…
values-pt-rBR
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-pt-rBR-nokeys
Import translations. DO NOT MERGE
2015-11-04 12:11:39 -08:00
values-pt-rPT
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-pt-rPT-nokeys
…
values-rm-nokeys
…
values-ro
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ro-nokeys
Import translations. DO NOT MERGE
2015-11-04 12:11:39 -08:00
values-ru
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ru-nokeys
…
values-si-nokeys
…
values-si-rLK
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-si-rLK-nokeys
…
values-sk
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-sk-nokeys
…
values-sl
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-sl-nokeys
…
values-sq-rAL
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-sq-rAL-nokeys
Import translations. DO NOT MERGE
2015-05-13 21:12:10 -07:00
values-sr
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-sr-nokeys
…
values-sv
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-sv-nokeys
…
values-sw
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-sw400dp
[Fingerprint] Smaller enrolling ring
2015-08-18 18:30:36 -07:00
values-sw600dp
[LockScreen] Setup Wizard pattern lock landscape layout
2015-05-26 11:29:35 -07:00
values-sw600dp-land
[WifiSettings] Align text in Wi-Fi dialog
2015-04-29 17:49:52 -07:00
values-sw720dp
[WifiSettings] Align text in Wi-Fi dialog
2015-04-29 17:49:52 -07:00
values-sw720dp-land
…
values-sw-nokeys
…
values-ta-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ta-rIN-nokeys
…
values-te-rIN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-te-rIN-nokeys
…
values-th
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-th-nokeys
…
values-tl
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-tl-nokeys
…
values-tr
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-tr-nokeys
…
values-uk
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-uk-nokeys
…
values-ur-rPK
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-ur-rPK-nokeys
…
values-uz-rUZ
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-uz-rUZ-nokeys
…
values-vi
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-vi-nokeys
…
values-xlarge
…
values-zh-rCN
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-zh-rCN-nokeys
…
values-zh-rHK
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-zh-rHK-nokeys
…
values-zh-rTW
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-zh-rTW-nokeys
…
values-zu
resolve merge conflicts of 94ab88228e to master.
2015-12-28 11:20:58 -08:00
values-zu-nokeys
…
xml
Conditionally show settings.
2015-12-18 15:50:05 -05:00