Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
eeb60f9473f2e070228cfaec75e757413a50dcba
packages_apps_Settings/res
History
Wei Wang eeb60f9473 Merge commit 'fc8d2556' into manualmerge 
Conflicts:
	res/values/strings.xml

Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
2014-01-14 22:33:21 -08:00
..
drawable
Add resources for light theme
2013-08-30 10:10:02 -07:00
drawable-hdpi
Remove outdated custom background for password field.
2014-01-08 15:03:25 -08:00
drawable-ldrtl-hdpi
Add resources for light theme
2013-08-30 10:10:02 -07:00
drawable-ldrtl-mdpi
Add resources for light theme
2013-08-30 10:10:02 -07:00
drawable-ldrtl-xhdpi
Add resources for light theme
2013-08-30 10:10:02 -07:00
drawable-mdpi
Remove outdated custom background for password field.
2014-01-08 15:03:25 -08:00
drawable-nodpi
Update power widget icons and fix location behavior
2013-11-07 11:20:35 -08:00
drawable-xhdpi
Remove outdated custom background for password field.
2014-01-08 15:03:25 -08:00
drawable-xxhdpi
Settings for NFC Unlock
2013-12-06 13:50:26 -08:00
layout
BLE peripheral mode (4/4): Settings change for advertising preference.
2014-01-13 17:41:02 -08:00
layout-land
Remove outdated custom background for password field.
2014-01-08 15:03:25 -08:00
layout-sw600dp
Remove outdated custom background for password field.
2014-01-08 15:03:25 -08:00
layout-sw600dp-land
Remove outdated custom background for password field.
2014-01-08 15:03:25 -08:00
layout-sw720dp
Single pane for 10" Settings
2013-08-06 16:23:37 -07:00
menu
Remove Google Play specific search URIs from Settings.
2013-09-30 15:59:46 -07:00
mipmap-hdpi
updated launcher settings icon to gray gear
2013-10-04 21:48:02 +00:00
mipmap-mdpi
updated launcher settings icon to gray gear
2013-10-04 21:48:02 +00:00
mipmap-xhdpi
updated launcher settings icon to gray gear
2013-10-04 21:48:02 +00:00
mipmap-xxhdpi
updated launcher settings icon to gray gear
2013-10-04 21:48:02 +00:00
mipmap-xxxhdpi
updated launcher settings icon to gray gear
2013-10-04 21:48:02 +00:00
raw
…
values
Merge commit 'fc8d2556' into manualmerge
2014-01-14 22:33:21 -08:00
values-af
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-af-nokeys
…
values-am
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-am-nokeys
…
values-ar
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-ar-nokeys
Import translations. DO NOT MERGE
2013-08-21 16:15:15 -07:00
values-az
Import translations. DO NOT MERGE
2013-08-26 14:06:36 -07:00
values-az-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-az-rAZ
Import translations. DO NOT MERGE
2013-09-11 15:40:07 -07:00
values-az-rAZ-nokeys
Import translations. DO NOT MERGE
2013-08-28 23:43:04 -07:00
values-be-nokeys
…
values-bg
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-bg-nokeys
…
values-ca
Import translations. DO NOT MERGE
2014-01-13 14:04:01 -08:00
values-ca-nokeys
…
values-cs
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-cs-nokeys
…
values-da
Import translations. DO NOT MERGE
2014-01-13 14:04:01 -08:00
values-da-nokeys
…
values-de
Import translations. DO NOT MERGE
2014-01-08 11:18:23 -08:00
values-de-nokeys
…
values-el
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-el-nokeys
…
values-en-rGB
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-en-rGB-nokeys
…
values-en-rIN
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-en-rIN-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-es
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-es-nokeys
…
values-es-rUS
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-es-rUS-nokeys
…
values-et-nokeys
…
values-et-rEE
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-et-rEE-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-fa
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-fa-nokeys
Import translations. DO NOT MERGE
2013-08-21 16:15:15 -07:00
values-fi
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-fi-nokeys
…
values-fr
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-fr-nokeys
…
values-fr-rCA
Import translations. DO NOT MERGE
2014-01-08 11:18:23 -08:00
values-fr-rCA-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-hi
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-hi-nokeys
Import translations. DO NOT MERGE
2013-10-16 23:18:02 -07:00
values-hr
Import translations. DO NOT MERGE
2013-12-30 15:13:19 -08:00
values-hr-nokeys
…
values-hu
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-hu-nokeys
…
values-hy-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-hy-rAM
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-hy-rAM-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-in
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-in-nokeys
…
values-it
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-it-nokeys
…
values-iw
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-iw-nokeys
Import translations. DO NOT MERGE
2013-09-19 02:54:26 -07:00
values-ja
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-ja-nokeys
…
values-ka-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-ka-rGE
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-ka-rGE-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-km-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-km-rKH
Import translations. DO NOT MERGE
2014-01-08 11:18:23 -08:00
values-km-rKH-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-ko
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-ko-nokeys
…
values-land
Add captioning preferences screen
2013-08-06 13:53:58 -07:00
values-lo-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-lo-rLA
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-lo-rLA-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-lt
Import translations. DO NOT MERGE
2014-01-08 11:18:23 -08:00
values-lt-nokeys
…
values-lv
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-lv-nokeys
…
values-mn-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-mn-rMN
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-mn-rMN-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-ms-nokeys
…
values-ms-rMY
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-ms-rMY-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-nb
Import translations. DO NOT MERGE
2014-01-08 11:18:23 -08:00
values-nb-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-ne
Import translations. DO NOT MERGE
2013-08-21 16:15:15 -07:00
values-ne-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-ne-rNP
Import translations. DO NOT MERGE
2013-09-11 15:40:07 -07:00
values-ne-rNP-nokeys
Import translations. DO NOT MERGE
2013-08-26 14:06:36 -07:00
values-nl
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-nl-nokeys
…
values-nokeys
…
values-pl
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-pl-nokeys
…
values-pt
Import translations. DO NOT MERGE
2014-01-06 18:49:53 -08:00
values-pt-nokeys
…
values-pt-rPT
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-pt-rPT-nokeys
…
values-rm
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-rm-nokeys
…
values-ro
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-ro-nokeys
…
values-ru
Import translations. DO NOT MERGE
2014-01-13 14:04:01 -08:00
values-ru-nokeys
…
values-si
Import translations. DO NOT MERGE
2013-08-21 16:15:15 -07:00
values-si-nokeys
Import translations. DO NOT MERGE
2013-08-19 12:14:29 -07:00
values-si-rLK
Import translations. DO NOT MERGE
2013-09-11 15:40:07 -07:00
values-si-rLK-nokeys
Import translations. DO NOT MERGE
2013-08-26 14:06:36 -07:00
values-sk
Import translations. DO NOT MERGE
2014-01-08 11:18:23 -08:00
values-sk-nokeys
…
values-sl
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-sl-nokeys
…
values-sr
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-sr-nokeys
…
values-sv
Import translations. DO NOT MERGE
2014-01-13 14:04:01 -08:00
values-sv-nokeys
…
values-sw
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-sw600dp
Single pane for 10" Settings
2013-08-06 16:23:37 -07:00
values-sw600dp-land
Updated layouts for keyguard widget picker
2012-11-07 00:00:11 -08:00
values-sw720dp
Single pane for 10" Settings
2013-08-06 16:23:37 -07:00
values-sw720dp-land
Single pane for 10" Settings
2013-08-06 16:23:37 -07:00
values-sw-nokeys
…
values-th
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-th-nokeys
…
values-tl
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-tl-nokeys
…
values-tr
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-tr-nokeys
…
values-uk
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-uk-nokeys
…
values-vi
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-vi-nokeys
…
values-xlarge
…
values-zh-rCN
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-zh-rCN-nokeys
…
values-zh-rHK
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-zh-rHK-nokeys
Import translations. DO NOT MERGE
2013-09-14 21:12:30 -07:00
values-zh-rTW
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-zh-rTW-nokeys
…
values-zu
Import translations. DO NOT MERGE
2013-12-26 16:30:07 -08:00
values-zu-nokeys
…
xml
BLE peripheral mode (4/4): Settings change for advertising preference.
2014-01-13 17:41:02 -08:00