Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dab025bdffad3ede22367b8c7fa9303358057e6d
packages_apps_Settings/res
History
Colin Cross dab025bdff resolved conflicts for merge of 769ba03b to master 
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07: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
Actually gracefully finish this time around.
2015-06-16 20:21:12 -07:00
drawable-hdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-ldrtl-hdpi
Wrap tintable icons with correctly tinted drawable XML
2015-04-10 15:46:18 -07:00
drawable-ldrtl-mdpi
Wrap tintable icons with correctly tinted drawable XML
2015-04-10 15:46:18 -07:00
drawable-ldrtl-xhdpi
Wrap tintable icons with correctly tinted drawable XML
2015-04-10 15:46:18 -07:00
drawable-mdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07: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
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-xxhdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
drawable-xxxhdpi
[ScreenLock] Update illustration during setup wizard
2015-07-20 16:40:51 -07:00
interpolator
Add animation for fingerprint icon
2015-04-28 19:20:59 +00:00
layout
am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
2015-07-23 20:26:15 +00:00
layout-land
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 11:14:22 -07:00
layout-sw600dp
Fix up Tap and Pay how it works.
2015-07-10 15:43:25 +02:00
layout-sw600dp-land
[Setup] Use SetupWizardLayout
2015-04-21 10:19:35 -07:00
layout-sw720dp
…
menu
Bring back gear icon for advanced app settings
2015-06-09 15:45:17 -04:00
mipmap-hdpi
Update Settings App icons
2014-09-29 19:17:56 -07:00
mipmap-mdpi
Update Settings App icons
2014-09-29 19:17:56 -07:00
mipmap-xhdpi
Update Settings App icons
2014-09-29 19:17:56 -07:00
mipmap-xxhdpi
Update Settings App icons
2014-09-29 19:17:56 -07:00
mipmap-xxxhdpi
Update Settings App icons
2014-09-29 19:17:56 -07:00
raw
…
values
[Fingerprint] Add strings for fingerprint during SUW
2015-07-22 11:21:31 -07:00
values-af
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-af-nokeys
…
values-am
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-am-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-ar
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ar-nokeys
…
values-az-nokeys
…
values-az-rAZ
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-az-rAZ-nokeys
…
values-be-nokeys
…
values-bg
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-bg-nokeys
…
values-bn-rBD
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-bn-rBD-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-ca
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ca-nokeys
…
values-cs
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-cs-nokeys
…
values-da
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-da-nokeys
…
values-de
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-de-nokeys
…
values-el
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-el-nokeys
…
values-en-rAU
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-en-rAU-nokeys
Import translations. DO NOT MERGE
2015-03-21 02:21:25 -05:00
values-en-rGB
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-en-rGB-nokeys
…
values-en-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-en-rIN-nokeys
…
values-es
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-es-nokeys
…
values-es-rUS
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-es-rUS-nokeys
…
values-et-nokeys
…
values-et-rEE
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-et-rEE-nokeys
…
values-eu-rES
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-eu-rES-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-fa
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-fa-nokeys
…
values-fi
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-fi-nokeys
…
values-fr
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-fr-nokeys
…
values-fr-rCA
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-fr-rCA-nokeys
…
values-gl-rES
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-gl-rES-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-gu-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-gu-rIN-nokeys
Import translations. DO NOT MERGE
2015-05-13 21:12:10 -07:00
values-h330dp
Ensure redaction settings are visible on narrow screens
2015-03-05 20:13:40 +01:00
values-h480dp
Added Wifi Assistant Card
2014-07-16 15:46:09 -07:00
values-hi
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-hi-nokeys
…
values-hr
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-hr-nokeys
…
values-hu
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-hu-nokeys
…
values-hy-nokeys
…
values-hy-rAM
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-hy-rAM-nokeys
…
values-in
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-in-nokeys
…
values-is-rIS
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-is-rIS-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-it
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-it-nokeys
…
values-iw
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-iw-nokeys
…
values-ja
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ja-nokeys
…
values-ka-nokeys
…
values-ka-rGE
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ka-rGE-nokeys
…
values-kk-rKZ
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-kk-rKZ-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-km-nokeys
…
values-km-rKH
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-km-rKH-nokeys
…
values-kn-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-kn-rIN-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-ko
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ko-nokeys
…
values-ky-rKG
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-land
[WifiSettings] Align text in Wi-Fi dialog
2015-04-29 17:49:52 -07:00
values-lo-nokeys
…
values-lo-rLA
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-lo-rLA-nokeys
…
values-lt
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-lt-nokeys
…
values-lv
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-lv-nokeys
…
values-mcc001-mnc01
Test APNs
2014-08-28 16:22:19 +00:00
values-mcc001-mnc010
Test APNs
2014-08-28 16:22:19 +00:00
values-mcc246-mnc081
Test APNs
2014-08-28 16:22:19 +00:00
values-mcc310-mnc028
Test APNs
2014-08-28 16:22:19 +00:00
values-mcc311-mnc390
Test APNs
2014-08-28 16:22:19 +00:00
values-mk-rMK
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-mk-rMK-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-ml-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ml-rIN-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-mn-nokeys
…
values-mn-rMN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-mn-rMN-nokeys
…
values-mr-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-mr-rIN-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-ms-nokeys
…
values-ms-rMY
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ms-rMY-nokeys
…
values-my-rMM
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-my-rMM-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-nb
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-nb-nokeys
…
values-ne-nokeys
…
values-ne-rNP
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ne-rNP-nokeys
…
values-night
RIP -night DO NOT MERGE
2015-06-17 09:17:31 -04:00
values-nl
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-nl-nokeys
…
values-nokeys
…
values-pa-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-pa-rIN-nokeys
Import translations. DO NOT MERGE
2015-04-25 00:12:23 -07:00
values-pl
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-pl-nokeys
…
values-pt
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-pt-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-pt-rBR
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-pt-rBR-nokeys
Import translations. DO NOT MERGE
2015-07-20 15:26:26 -07:00
values-pt-rPT
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-pt-rPT-nokeys
…
values-rm-nokeys
…
values-ro
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ro-nokeys
Import translations. DO NOT MERGE
2015-03-16 06:39:11 -07:00
values-ru
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ru-nokeys
…
values-si-nokeys
…
values-si-rLK
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-si-rLK-nokeys
…
values-sk
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-sk-nokeys
…
values-sl
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-sl-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-sq-rAL
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-sq-rAL-nokeys
Import translations. DO NOT MERGE
2015-05-13 21:12:10 -07:00
values-sr
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-sr-nokeys
…
values-sv
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-sv-nokeys
…
values-sw
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -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
Make edge effect goes border to border on xlarge tablets
2014-06-29 14:54:07 -07:00
values-sw-nokeys
…
values-ta-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ta-rIN-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-te-rIN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-te-rIN-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-th
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-th-nokeys
…
values-tl
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-tl-nokeys
…
values-tr
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-tr-nokeys
…
values-uk
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-uk-nokeys
…
values-ur-rPK
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-ur-rPK-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-uz-rUZ
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-uz-rUZ-nokeys
Import translations. DO NOT MERGE
2015-02-26 13:08:22 -08:00
values-vi
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-vi-nokeys
…
values-xlarge
…
values-zh-rCN
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-zh-rCN-nokeys
…
values-zh-rHK
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-zh-rHK-nokeys
…
values-zh-rTW
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-zh-rTW-nokeys
…
values-zu
Import translations. DO NOT MERGE
2015-07-23 17:57:24 -07:00
values-zu-nokeys
…
xml
resolved conflicts for merge of 769ba03b to master
2015-07-23 21:43:07 -07:00