Commit Graph

13250 Commits

Author SHA1 Message Date
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
f2398abe54 Import translations. DO NOT MERGE
Change-Id: Ie72bd5a59406450877a580e2c60c0c81f48ef603
Auto-generated-cl: translation import
2013-12-18 22:15:35 -08: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
1bb8618339 am 665d1db2: (-s ours) am d48a1386: (-s ours) am 379bb6ef: (-s ours) am ee9a2cbc: (-s ours) am 1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '665d1db296cf2cc9fb527ebe9a376ac2428ebb13':
  Import translations. DO NOT MERGE
2013-12-17 17:41:44 +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
ecee72d15e Merge "Import translations. DO NOT MERGE" 2013-12-17 17:31:04 +00:00
Alan Viverette
17bf9338f6 Merge "Update A11y service dialog for explicit create() before getButton()" 2013-12-17 01:20:41 +00:00
Baligh Uddin
26bfaefa84 Import translations. DO NOT MERGE
Change-Id: Iae6f3674d6838e5027505bde8a176c6d1add43df
Auto-generated-cl: translation import
2013-12-16 12:47:52 -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
Andres Morales
73fed2c477 Merge "fix npe in SecuritySettings" 2013-12-16 19:27:30 +00:00
Andres Morales
5786e5f471 fix npe in SecuritySettings
Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
2013-12-16 11:23:14 -08:00
Kenny Root
2d8e25af35 am 3bf6ac0c: am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '3bf6ac0c0ea1fe05f925d8df3db2e35f674dce4a':
  Use java.util.Objects instead of internal API
2013-12-13 22:57:33 +00: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
Andres Morales
ef693b5707 Merge "Settings for NFC Unlock" 2013-12-12 17:38:26 +00:00
Baligh Uddin
5a14ab8930 am 061662cb: (-s ours) am 02dd4a20: (-s ours) am f4f14efc: (-s ours) am 5fcebc78: (-s ours) am 879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '061662cb1734b84709d019ac1d92ad418f3c966c':
  Import translations. DO NOT MERGE
2013-12-12 16:54:17 +00: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
Alan Viverette
72cb46f1b7 Update A11y service dialog for explicit create() before getButton()
Change-Id: Ic0fb7e2e7985dd3d3b65e40a639ab5fc0f5a8fd5
2013-12-11 16:07:00 -08:00
Vinit Deshapnde
c621418d3d Move Wifi/P2p service components under services
Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.

Similar issue exists with WifiEnterpriseConfig constants.

Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
2013-12-11 16:05:46 -08:00
Alan Viverette
22b70376ed Merge "Accessibility: filter touches to Enable button" 2013-12-10 21:58:45 +00:00
Alan Viverette
3829a7b2e5 Merge "Remove dialog offering to download TalkBack" 2013-12-10 21:54:02 +00:00
Alan Viverette
24ef59737b Remove dialog offering to download TalkBack
GMS devices are required to have at least one accessibility service
installed, and AOSP devices will not have Play Store, so this dialog
is obsolete.

BUG: 10429642
Change-Id: I08db466b305a4a73c35325656d143afdfcecf061
2013-12-10 13:19:13 -08:00
Qiwen Zhao
cb5a8578ea am 76aa20fa: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '76aa20fa31f6287dc2333f9627e85ffc6ccccf7a':
2013-12-10 18:47:22 +00:00
Alan Viverette
96118a4d53 Accessibility: filter touches to Enable button
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.

Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
2013-12-09 19:08:36 -08:00
Baligh Uddin
38bd642e23 Remove deprecated locales
Bug:11340849

Change-Id: I991b4918581b47f38f32dcad0fe77aa9301414c0
2013-12-09 22:54:15 +00:00
Qiwen Zhao
76aa20fa31 DO NOT MERGE reset to goog/klp-volantis-dev 2013-12-09 14:21:29 -08:00
Baligh Uddin
b10c4427ce am ebadadc8: (-s ours) am b69795b6: (-s ours) am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
* commit 'ebadadc8a4db3764a2238e97605ce605d5b2a21e':
  Import translations. DO NOT MERGE
2013-12-09 20:33:16 +00: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
fee406c3f9 Import translations. DO NOT MERGE
Change-Id: I3b193d0d03e33dc55b17f50086c7c0ef53853655
Auto-generated-cl: translation import
2013-12-09 11:53:08 -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
93858eaf1e am f95cea5b: (-s ours) snap to klp-dev-plus-aosp 9cadf8b with history
* commit 'f95cea5b924c1903148571e0506f16a2f318d4ba':
2013-12-06 22:19:05 +00:00
Andres Morales
fd2b629335 Settings for NFC Unlock
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
2013-12-06 13:50:26 -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
af462332cd am 65245b94: am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
* commit '65245b94f346add994acee060454561355c2d261':
2013-12-06 01:38:40 +00: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