Commit Graph

12138 Commits

Author SHA1 Message Date
Mark Salyzyn
ce258caa4a Merge changes I8f067f14,I54d8255a,Ib15917bf
* changes:
  Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
  Settings: logd: increase dialog title field size to 59
  Settings: logd: increase summary field size to 30
2014-06-17 23:00:03 +00:00
Fabrice Di Meglio
07d976e431 Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
- prevent NPE
- define default value (to 256K)
- add more logs for showing value which has been set or any exception

Bug: 15687210
Change-Id: I8f067f14d81ee56631d1ad74b91b5ede26cae125
2014-06-17 10:55:20 -07:00
Mark Salyzyn
20f1b207d0 Settings: logd: increase dialog title field size to 59
Bug: 15660860
Change-Id: I54d8255a1fc28ff41e8d8adc693d2e66ff4cc311
2014-06-17 09:56:30 -07:00
Mark Salyzyn
44cf6b73b6 Settings: logd: increase summary field size to 30
Bug: 15661901
Bug: 15661903
Bug: 15644939
Bug: 15644940
Bug: 15662401
Bug: 15665444
Bug: 15668253
Change-Id: Ib15917bfdd4a1028d5d9d8ac4f7afe772a0ba77b
2014-06-17 09:48:51 -07:00
Mark Salyzyn
5a9a18c15b Merge "logd: Add Developer settings for size" 2014-06-10 21:49:56 +00:00
Mark Salyzyn
408c89bfb5 logd: Add Developer settings for size
- Dependent on some logd/init/selinux security changes.

Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
2014-06-13 20:20:08 +00:00
Brian Carlstrom
2ce0dcdad4 am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '70f2201c7ab842df6c45a1540803239eafa267ed':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:43 +00:00
Brian Carlstrom
70f2201c7a Merge "Move to dalvik.vm.lib.2 to force default to libart" 2014-05-28 22:28:47 +00:00
Brian Carlstrom
9d7e2b1949 Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175

(cherry picked from commit 3bc8aaad29)

Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
2014-05-28 14:48:15 -07:00
Jeff Sharkey
14f42ca9f4 am 110ddbfe: Merge "Fix NullPointerException issue when user change"
* commit '110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
  Fix NullPointerException issue when user change
2014-05-09 17:41:27 +00:00
Jeff Sharkey
110ddbfea0 Merge "Fix NullPointerException issue when user change" 2014-05-09 17:35:27 +00:00
Zhihai Xu
d6b0b1721a am 7dd84651: Merge "Display BTH connected status correctly"
* commit '7dd84651a25566c5a2152d935f19a11cebfc58ae':
  Display BTH connected status correctly
2014-04-30 18:25:22 +00:00
Zhihai Xu
7dd84651a2 Merge "Display BTH connected status correctly" 2014-04-30 18:22:49 +00:00
Tsuyoshi Kamata
89377530c7 Display BTH connected status correctly
This patch removes incorrect condition.
(to not use LocalBluetoothProfile#isPreferred())
This condition uses the priority that already disconnected profile,
so this codition always returns false.

To verify this issue:
1. Turn on Bluetooth.
2. Pair and connect to BTH(A2DP/HFP)
3. The display now says "Connected"
3. Disconnect HFP profile
4. The display still says "Connected" but it should say "Connected (no phone)"

Change-Id: I9e2bfa6d23bf1be7587c9556b4b05459d02c4817
2014-04-30 18:20:55 +00:00
Bill Yi
a3860afcb5 Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD 2014-04-29 11:34:27 -07:00
Jun Su
bf427a2064 Fix NullPointerException issue when user change
When info is null, we have risk to have access null point.

Change-Id: Ie6acee5c99d6297e31d46585435a735a38b19e82
2014-04-26 13:36:06 +08:00
Elliott Hughes
4c94185028 Merge "Track MutableBoolean's new package." 2014-04-24 23:52:13 +00:00
Elliott Hughes
309004706c Track MutableBoolean's new package.
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
2014-04-23 18:04:40 -07:00
Wink Saville
242184ca23 Merge "Allow tablets to send SMS if enabled in device overlays (1/2)" 2014-04-16 20:21:57 +00:00
Baligh Uddin
36a1bbe890 am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit 'b86dff8480e486847148f9651bc830b762d307ee':
  Import translations. DO NOT MERGE
2014-03-25 17:02:01 +00:00
Baligh Uddin
b86dff8480 am da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit 'da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
  Import translations. DO NOT MERGE
2014-03-25 16:54:48 +00:00
Baligh Uddin
da4a6a53d4 Import translations. DO NOT MERGE
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
2014-03-24 12:59:14 -07:00
Baligh Uddin
d274a6cfa2 am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE
2014-03-20 19:04:14 +00:00
Baligh Uddin
2e71c1df7c am 947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
  Import translations. DO NOT MERGE
2014-03-20 18:41:54 +00:00
Baligh Uddin
947e899585 Import translations. DO NOT MERGE
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
2014-03-19 13:10:41 -07:00
Geoff Mendal
f6eceb2c79 am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
  Import translations. DO NOT MERGE
2014-03-17 20:43:48 +00:00
Geoff Mendal
c8131cb90e am e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit 'e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
  Import translations. DO NOT MERGE
2014-03-17 20:34:20 +00:00
Geoff Mendal
e8de72e53a Import translations. DO NOT MERGE
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
2014-03-17 12:42:54 -07:00
David Braun
6e7db71959 am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
* commit '63ac6a06efd39078b3fc066896fc7ea003ab34ce':
  Add string parameter order to default SMS dialog text
2014-03-14 04:12:47 +00:00
Baligh Uddin
da5cd9f430 am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '255034803c3301cbf93ce64a2740af2abe8dc1f9':
  Import translations. DO NOT MERGE
2014-03-14 04:12:35 +00:00
Przemyslaw Szczepaniak
38aeec0ad8 am 6829c48c: Merge "Fix F/C in TTS settings"
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
  Fix F/C in TTS settings
2014-03-13 23:18:44 +00:00
David Braun
63ac6a06ef am edcb923d: Add string parameter order to default SMS dialog text
* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
  Add string parameter order to default SMS dialog text
2014-03-13 18:30:11 +00:00
David Braun
edcb923df6 Add string parameter order to default SMS dialog text
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
2014-03-13 11:20:48 -07:00
Baligh Uddin
255034803c am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
  Import translations. DO NOT MERGE
2014-03-13 16:40:31 +00:00
Przemyslaw Szczepaniak
6829c48c36 Merge "Fix F/C in TTS settings" 2014-03-13 15:26:49 +00:00
Shuhrat Dehkanov
f365216391 Fix F/C in TTS settings
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.

Please see https://code.google.com/p/android/issues/detail?id=63122

Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
2014-03-13 12:06:17 +09:00
Narayan Kamath
5877242019 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
2014-03-13 01:55:25 +00:00
Baligh Uddin
14cc7647cb am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
  Import translations. DO NOT MERGE
2014-03-12 20:40:19 +00:00
Baligh Uddin
7c35c10ebc Import translations. DO NOT MERGE
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
2014-03-12 12:02:29 -07:00
Alan Viverette
23d01e0b4b am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
2014-03-11 23:05:19 +00:00
Alan Viverette
451994bf10 am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-11 23:05:13 +00:00
Matthew Xie
4f9fa80d37 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946
2014-03-11 18:16:34 +00:00
Narayan Kamath
ed44913789 am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-03-11 18:16:11 +00:00
Narayan Kamath
01723221ff am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-03-11 18:16:09 +00:00
Baligh Uddin
846f036ef1 am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
  Import translations. DO NOT MERGE
2014-03-11 17:41:25 +00:00
Baligh Uddin
14b82fd73f Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:37:53 +00:00
Narayan Kamath
c776bbb156 Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76 Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
This reverts commit 9ebc27c73e.

Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
2014-03-11 13:05:37 +00:00
Alan Viverette
0100a310d8 am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity
2014-03-11 02:15:28 +00:00
Alan Viverette
a74da813ec am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
  DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-11 02:15:27 +00:00