Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,119 Commits 1 Branch 0 Tags
a5b5bfbbef09b074328c84f9e1980b62dffab480
Commit Graph

12119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
0ae418b207 Import translations. DO NOT MERGE 
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
 2013-12-30 15:09:59 -08:00
Baligh Uddin
be790f347a am 6c6d0738: (-s ours) am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE 
* commit '6c6d073847c1c26861671e042a1916b3efcdf5d9':
  Import translations. DO NOT MERGE
 2013-12-27 04:04:22 +00:00
Baligh Uddin
6c6d073847 am 95fbce75: (-s ours) am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE 
* commit '95fbce75a7a3c4937c08b610965cc7d7e1aea403':
  Import translations. DO NOT MERGE
 2013-12-27 04:01:11 +00:00
Baligh Uddin
95fbce75a7 am d0c1b8cb: (-s ours) am 0f952752: (-s ours) Import translations. DO NOT MERGE 
* commit 'd0c1b8cbee025b009261a5e9e3ae37e9cbb891ef':
  Import translations. DO NOT MERGE
 2013-12-26 19:57:05 -08:00
Baligh Uddin
d0c1b8cbee am 0f952752: (-s ours) Import translations. DO NOT MERGE 
* commit '0f952752e387cd4035193015ff3fa793164c980c':
  Import translations. DO NOT MERGE
 2013-12-26 19:51:27 -08:00
Baligh Uddin
0f952752e3 Import translations. DO NOT MERGE 
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
 2013-12-26 16:26:39 -08:00
Baligh Uddin
0c70ceef84 am 5f4deba1: (-s ours) am fb793cb9: (-s ours) am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE 
* commit '5f4deba185e4ab2b3c121822add6cf0ec8ec5612':
  Import translations. DO NOT MERGE
 2013-12-19 15:34:33 +00:00
Baligh Uddin
5f4deba185 am fb793cb9: (-s ours) am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE 
* commit 'fb793cb94e762c8c50072c529bba093777d3fa9f':
  Import translations. DO NOT MERGE
 2013-12-19 15:32:59 +00:00
Baligh Uddin
fb793cb94e am 8c810a4e: (-s ours) am 7ba72721: (-s ours) Import translations. DO NOT MERGE 
* commit '8c810a4e5dd0435f621e4f3f691bfc567d948ee0':
  Import translations. DO NOT MERGE
 2013-12-19 07:30:01 -08:00
Baligh Uddin
8c810a4e5d am 7ba72721: (-s ours) Import translations. DO NOT MERGE 
* commit '7ba72721134adeda10972f68fbcf74a491c6b11e':
  Import translations. DO NOT MERGE
 2013-12-19 07:28:03 -08:00
Johan Redestig
5517ad92dd Dont show "Erase SD Card" when there is none 
On devices with physcal, external SD Cards, the "Erase SD card"
option in in Settings/Storage is available even when there is
no SD card present, this dont make much sense since you cannot
erase a card that is absent. With this change the erase option
is bound to the mount toggle which leads to the following
consequences:

 Card present and mounted -> Erase enabled
 Card present but unmounted -> Erase enabled
 No card present -> Erase disabled
 Card present and MTP attached -> Erase disabled

Change-Id: I756ae8af3e0565febaf940df5f4991dd89105bd9
 2013-12-19 10:47:17 +01:00
Baligh Uddin
7ba7272113 Import translations. DO NOT MERGE 
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
 2013-12-18 22:12:01 -08:00
Behrooz Aliabadi
524dee0fb5 Fix null pointer exceptions in NetworkPolicyEditor 
This upload fixes a null pointer exception issue.
After this fix the modified methods return
their corresponding default values instead of null.

Change-Id: Idb94f8b808b8dd18be5e3fc92cc5560ce0f81c4f
 2013-12-18 09:55:45 +00:00
Baligh Uddin
665d1db296 am d48a1386: (-s ours) am 379bb6ef: (-s ours) am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE 
* commit 'd48a138605e735175b519cb998e478a7aad0c60f':
  Import translations. DO NOT MERGE
 2013-12-17 17:40:19 +00:00
Baligh Uddin
d48a138605 am 379bb6ef: (-s ours) am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE 
* commit '379bb6ef5a1140497c7cf3510faea1c705fe4583':
  Import translations. DO NOT MERGE
 2013-12-17 17:38:44 +00:00
Baligh Uddin
379bb6ef5a am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE 
* commit 'ee9a2cbcf3a12f65ddbc05507bf51ad161feee05':
  Import translations. DO NOT MERGE
 2013-12-17 09:35:44 -08:00
Baligh Uddin
ee9a2cbcf3 am 1177cdec: (-s ours) Import translations. DO NOT MERGE 
* commit '1177cdec4eeeacc787059a7843ade6571f54ac5f':
  Import translations. DO NOT MERGE
 2013-12-17 09:33:32 -08:00
Baligh Uddin
1177cdec4e Import translations. DO NOT MERGE 
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
 2013-12-16 12:44:01 -08:00
Kenny Root
3bf6ac0c0e am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API" 
* commit 'ead1bcd9a23a811b25a73e663c556c590e649d82':
  Use java.util.Objects instead of internal API
 2013-12-13 22:04:16 +00:00
Kenny Root
ead1bcd9a2 am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API" 
* commit 'ef2f97c70e5942f390daf8e227eafa44ea675f09':
  Use java.util.Objects instead of internal API
 2013-12-13 22:01:13 +00:00
Kenny Root
ef2f97c70e am e14a5ef6: Merge "Use java.util.Objects instead of internal API" 
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
  Use java.util.Objects instead of internal API
 2013-12-13 13:58:59 -08:00
Kenny Root
e14a5ef660 Merge "Use java.util.Objects instead of internal API" 2013-12-13 21:51:30 +00:00
Kenny Root
7440dde808 Use java.util.Objects instead of internal API 
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
 2013-12-13 13:28:33 -08:00
Baligh Uddin
061662cb17 am 02dd4a20: (-s ours) am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE 
* commit '02dd4a20e9a2ad1733e8cd52729f4c5683220f56':
  Import translations. DO NOT MERGE
 2013-12-12 16:51:25 +00:00
Baligh Uddin
02dd4a20e9 am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE 
* commit 'f4f14efc79b82b7f99d311ae59ec394d60ae81c1':
  Import translations. DO NOT MERGE
 2013-12-12 16:44:02 +00:00
Baligh Uddin
f4f14efc79 am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE 
* commit '5fcebc78b9f6a05ac661dba25acbd354981e9168':
  Import translations. DO NOT MERGE
 2013-12-12 08:40:48 -08:00
Baligh Uddin
5fcebc78b9 am 879cc42f: (-s ours) Import translations. DO NOT MERGE 
* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
  Import translations. DO NOT MERGE
 2013-12-12 07:46:25 -08:00
Baligh Uddin
879cc42fb3 Import translations. DO NOT MERGE 
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
 2013-12-11 20:01:51 -08:00
Qiwen Zhao
76aa20fa31 DO NOT MERGE reset to goog/klp-volantis-dev 2013-12-09 14:21:29 -08:00
Baligh Uddin
ebadadc8a4 am b69795b6: (-s ours) am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE 
* commit 'b69795b6f6a7a33fe20c2e6b06ef4be454ccdf98':
  Import translations. DO NOT MERGE
 2013-12-09 20:17:15 +00:00
Baligh Uddin
b69795b6f6 am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE 
* commit 'c5e0893521593aaa7dc7089eeaf4f14eac07dad7':
  Import translations. DO NOT MERGE
 2013-12-09 12:13:46 -08:00
Baligh Uddin
c5e0893521 am 233d666a: (-s ours) Import translations. DO NOT MERGE 
* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE
 2013-12-09 12:10:52 -08:00
Baligh Uddin
233d666aee Import translations. DO NOT MERGE 
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
 2013-12-09 11:47:45 -08:00
Qiwen Zhao
f95cea5b92 snap to klp-dev-plus-aosp 9cadf8b with history 2013-12-06 13:47:17 -08:00
The Android Open Source Project
65245b94f3 am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD 
* commit '9cadf8b10dee1e4dae9decb4f14f8d11f569eaa4':
 2013-12-06 01:33:54 +00:00
The Android Open Source Project
9cadf8b10d am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD 
* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':
 2013-12-05 17:25:39 -08:00
Maggie Benthall
fef3abf0fe am fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev 
* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
 2013-12-05 21:30:53 +00:00
Przemyslaw Szczepaniak
99c0fd825a am d92af47f: am 0e01f128: Fix for TTS settings crash. 
* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
 2013-12-05 21:30:31 +00:00
Baligh Uddin
43480718fd am 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE 
* commit '3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c':
 2013-12-05 21:30:17 +00:00
Baligh Uddin
2c50d95ab4 am 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE 
* commit '965d756920d556d95178d48127ee14abcda85916':
 2013-12-05 21:30:12 +00:00
Baligh Uddin
8568ad2d70 am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE 
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
 2013-12-05 21:30:10 +00:00
The Android Open Source Project
b568548747 Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD 2013-12-05 12:38:23 -08:00
Zhihai Xu
779afdfc6c am eb9cecd9: am 6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev 
* commit 'eb9cecd98b280c508b88d03ad788202ac0e35e53':
 2013-12-05 19:43:01 +00:00
Dianne Hackborn
306d51f4e6 am 3c7fdfd9: am a582a051: Proc stats UI improvements. 
* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':
 2013-12-05 19:40:43 +00:00
Martijn Coenen
67627fabb7 am 0aee1b15: am 53083ab2: Instantiate correct classes for tap&say settings. 
* commit '0aee1b150624f4b36e52e47fa97b8a18350d2df5':
 2013-12-05 19:40:15 +00:00
Geoffrey Borggaard
078b28dde9 am 863b8839: am fc6bc201: Allow navigation to TrustedCredentials User Certs by intent. 
* commit '863b8839c7685554b41f3143472a6f379fd29ad1':
 2013-12-05 19:40:14 +00:00
Dianne Hackborn
bcecc4a7f8 am b690af54: am f3796d0b: Merge "Improve process stats UI." into klp-dev 
* commit 'b690af54dc0c5e82d15226c5a85be713bcd25db2':
 2013-12-05 19:40:13 +00:00
Alan Viverette
418d1df727 am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev 
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
 2013-12-05 19:40:12 +00:00
Amith Yamasani
391e601ae2 am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev 
* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
 2013-12-05 19:37:05 +00:00
Amith Yamasani
962c7f874a am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev 
* commit '1eb6105f25dcecde565f9d56e5c87feed7bd520d':
 2013-12-05 19:33:28 +00:00