Robert Greenwalt
1faefa06a3
Merge "Fix one NPE in tethering setting"
2013-08-15 14:13:10 +00:00
The Android Automerger
0b05593ee7
merge in klp-release history after reset to klp-dev
2013-08-15 06:01:30 -07:00
Jianzheng Zhou
508c7c16ab
Fix one NPE in tethering setting
...
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.
Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com >
2013-08-15 14:34:52 +08:00
Lifu Tang
5d4e69a527
Shows "App Info" for system apps
...
If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app
Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c
2013-08-14 17:25:12 -07:00
Baligh Uddin
97bed1e29e
Import translations. DO NOT MERGE
...
Change-Id: Ica475ca583a88772689f57745da3023d9955e70b
Auto-generated-cl: translation import
2013-08-14 14:50:28 -07:00
Baligh Uddin
3c8c3f9b00
Import translations. DO NOT MERGE
...
Change-Id: I3504c607a35636c6e0455571e9e7006244564b95
Auto-generated-cl: translation import
2013-08-14 14:46:29 -07:00
Baligh Uddin
dbf26e70a1
Import translations. DO NOT MERGE
...
Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import
2013-08-14 14:44:15 -07:00
Baligh Uddin
8c6de9e052
Import translations. DO NOT MERGE
...
Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import
2013-08-14 14:42:52 -07:00
The Android Open Source Project
741b2b94c3
am c4cdd59e
: (-s ours) Reconcile with klp-release - do not merge
...
* commit 'c4cdd59e025e574a78c47bb6db83b31e46e66b04':
Fix bug when sharing to bluetooth.
Fix for TTS settings crash.
Restriction pin changes.
Remove Restrictions UI
Add some missing fragments to the whitelist
Potential fix for Settings instability on x-large.
Fix accidental creation of restriction entry for required apps
Fix broken strings in Settings
Always allow formatting of physical storage.
Guard against missing terminal app.
2013-08-14 14:30:02 -07:00
The Android Open Source Project
c4cdd59e02
Reconcile with klp-release - do not merge
...
Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95
2013-08-14 14:25:51 -07:00
Martijn Coenen
49583c9362
am 9995bcbc
: am fcfd865d
: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
...
* commit '9995bcbc820a2ef923dd77b0dfa100b754c9efe6':
NFC: Allow to get result from tap-pay default dialog.
2013-08-14 09:02:30 -07:00
Martijn Coenen
9995bcbc82
am fcfd865d
: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
...
* commit 'fcfd865d5c1f2e20952d64196922840a63e83411':
NFC: Allow to get result from tap-pay default dialog.
2013-08-14 09:00:01 -07:00
Martijn Coenen
fcfd865d5c
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
2013-08-14 15:58:07 +00:00
Martijn Coenen
e0a38911a3
NFC: Allow to get result from tap-pay default dialog.
...
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
2013-08-14 08:57:11 -07:00
The Android Automerger
278640ca83
merge in klp-release history after reset to klp-dev
2013-08-14 06:06:53 -07:00
Tom O'Neill
4a41f33c5a
am 0574c26c
: am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
Settings app supports location settings injection
2013-08-13 17:37:55 -07:00
Tom O'Neill
0574c26c36
am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
2013-08-13 17:34:20 -07:00
Tom O'Neill
cabe7e8218
Merge "Settings app supports location settings injection" into klp-dev
2013-08-14 00:30:30 +00:00
Maggie Benthall
d0e9f6ada3
Fix bug when sharing to bluetooth.
...
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
2013-08-13 13:29:45 -07:00
Przemyslaw Szczepaniak
72f078a310
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:29:35 -07:00
Maggie Benthall
b8bdd1a0c9
am fa6faf95
: am cd3eb97c
: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
Fix bug when sharing to bluetooth.
2013-08-13 10:05:36 -07:00
Maggie Benthall
fa6faf95bc
am cd3eb97c
: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
Fix bug when sharing to bluetooth.
2013-08-13 10:04:09 -07:00
Maggie Benthall
cd3eb97ce5
Merge "Fix bug when sharing to bluetooth." into klp-dev
2013-08-13 17:00:25 +00:00
Przemyslaw Szczepaniak
2dc0e493ab
am d92af47f
: am 0e01f128
: Fix for TTS settings crash.
...
* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
Fix for TTS settings crash.
2013-08-13 06:44:49 -07:00
Przemyslaw Szczepaniak
d92af47f93
am 0e01f128
: Fix for TTS settings crash.
...
* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
Fix for TTS settings crash.
2013-08-13 06:43:09 -07:00
The Android Automerger
d4434eae68
merge in klp-release history after reset to klp-dev
2013-08-13 06:04:16 -07:00
Przemyslaw Szczepaniak
0e01f128ab
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:05:48 +01:00
Baligh Uddin
c3c89394fc
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':
Import translations. DO NOT MERGE
2013-08-13 00:56:28 -07:00
Baligh Uddin
3b3a8b0972
am 0782e629
: (-s ours) am 508997ad
: (-s ours) am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0782e6293bec6f51e5ecd23525f945823e5b4632':
Import translations. DO NOT MERGE
2013-08-13 00:53:52 -07:00
Baligh Uddin
b305ebe6db
am 965d7569
: (-s ours) am fff94ce8
: (-s ours) am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '965d756920d556d95178d48127ee14abcda85916':
Import translations. DO NOT MERGE
2013-08-13 00:51:57 -07:00
Baligh Uddin
0782e6293b
am 508997ad
: (-s ours) am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '508997ad0729e16eb04c475f9be3e33ca5ed60cf':
Import translations. DO NOT MERGE
2013-08-13 00:48:30 -07:00
Baligh Uddin
c41b1e93d0
am b142c946
: (-s ours) am a45cd5a6
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
Import translations. DO NOT MERGE
2013-08-13 00:47:30 -07:00
Baligh Uddin
965d756920
am fff94ce8
: (-s ours) am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fff94ce8cc24861de614bedb193e926e62179e04':
Import translations. DO NOT MERGE
2013-08-13 00:47:21 -07:00
Baligh Uddin
508997ad07
am 728da455
: (-s ours) am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
2013-08-13 00:45:32 -07:00
Baligh Uddin
fff94ce8cc
am 08f1d439
: (-s ours) am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '08f1d439c7a278b0cd9afd60f2ba41e846f40543':
Import translations. DO NOT MERGE
2013-08-13 00:44:04 -07:00
Baligh Uddin
b142c9462f
am a45cd5a6
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a45cd5a60ef71e70c4d4530370f46766d517541a':
Import translations. DO NOT MERGE
2013-08-13 00:43:55 -07:00
Baligh Uddin
728da45580
am 03ae9bf0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
2013-08-13 00:42:15 -07:00
Baligh Uddin
08f1d439c7
am 05404105
: (-s ours) Import translations. DO NOT MERGE
...
* commit '054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
2013-08-13 00:42:11 -07:00
Tom O'Neill
e2921c9566
Settings app supports location settings injection
...
- Partial fix for b/10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
2013-08-12 16:22:48 -07:00
Maggie Benthall
3343d1aabb
Fix bug when sharing to bluetooth.
...
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
2013-08-12 18:40:45 -04:00
Baligh Uddin
f5ecf575da
Import translations. DO NOT MERGE
...
Change-Id: Id616ecb4c01bfd2a4ee8fa3199c3e2dfc0140f62
Auto-generated-cl: translation import
2013-08-12 11:54:53 -07:00
Baligh Uddin
a45cd5a60e
Import translations. DO NOT MERGE
...
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
2013-08-12 11:51:11 -07:00
Baligh Uddin
054041058f
Import translations. DO NOT MERGE
...
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
2013-08-12 11:48:59 -07:00
Baligh Uddin
03ae9bf0e9
Import translations. DO NOT MERGE
...
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
2013-08-12 11:47:40 -07:00
The Android Automerger
bc86ca6141
merge in klp-release history after reset to klp-dev
2013-08-12 06:02:34 -07:00
Zhihai Xu
9bef999b87
am eb9cecd9
: am 6ee5b450
: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit 'eb9cecd98b280c508b88d03ad788202ac0e35e53':
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:52:07 -07:00
Zhihai Xu
eb9cecd98b
am 6ee5b450
: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit '6ee5b4508083fd0dd340396d66927c0fc8870a9b':
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:49:59 -07:00
Zhihai Xu
6ee5b45080
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
2013-08-10 01:46:22 +00:00
Dianne Hackborn
0d78150a1f
am 3c7fdfd9
: am a582a051
: Proc stats UI improvements.
...
* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':
Proc stats UI improvements.
2013-08-09 16:49:18 -07:00
Dianne Hackborn
3c7fdfd9e9
am a582a051
: Proc stats UI improvements.
...
* commit 'a582a051951be9b1afd57e05fd6a405bccd9a46f':
Proc stats UI improvements.
2013-08-09 16:38:11 -07:00