Commit Graph

6199 Commits

Author SHA1 Message Date
Irfan Sheriff
83d31ad497 am 7d10591a: Fix NPE in advanced settings
* commit '7d10591a3b3c05019260d11f196a5ad742d3685d':
  Fix NPE in advanced settings
2011-12-07 12:12:59 -08:00
Irfan Sheriff
2898c54013 am 7d10591a: Fix NPE in advanced settings
* commit '7d10591a3b3c05019260d11f196a5ad742d3685d':
  Fix NPE in advanced settings
2011-12-07 12:10:15 -08:00
Irfan Sheriff
fec195d756 Fix NPE in advanced settings
Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
2011-12-07 12:08:57 -08:00
Irfan Sheriff
7d10591a3b Fix NPE in advanced settings
Bug: 5723974
Change-Id: I9904b6adb2b51f1511f932ef7cba8f6558417061
2011-12-07 11:40:49 -08:00
The Android Open Source Project
b3bd548c9b am c3933b34: Reconcile with ics-mr0-release
* commit 'c3933b34587e3c10269c05c2554e5a90ab4ce802':
  Remove watchdog setting for poor network avoidance
2011-12-07 11:03:53 -08:00
Irfan Sheriff
ac31ce6bd2 am 9ef669a6: am d03c1511: Remove watchdog setting for poor network avoidance
* commit '9ef669a65d6ecaabeb5cf1f8d342ae8032f6bfd5':
  Remove watchdog setting for poor network avoidance
2011-12-07 11:02:28 -08:00
Eric Fischer
57d31ef4df am 5166860e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5166860e0af455d3a60498eb9eae25a0aa4b447e':
  Import revised translations.  DO NOT MERGE
2011-12-07 11:02:11 -08:00
Eric Fischer
7f6dff02d1 am 5cee3120: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5cee3120246b37ffd9ab6756c198d3398b3e6ba7':
  Import revised translations.  DO NOT MERGE
2011-12-07 11:02:10 -08:00
Svetoslav Ganov
619ec917a4 am 7e8dcbea: Adding a system preference whether to speak passwords in accessibility mode (settings).
* commit '7e8dcbea65356807ca052ee5e98c9b25b7f0b1ca':
  Adding a system preference whether to speak passwords in accessibility mode (settings).
2011-12-07 09:27:55 -08:00
The Android Open Source Project
17045e2f1e am 99cad3ed: Reconcile with ics-mr1-release
* commit '99cad3edab1563498d354dba532fb91bf6cdd135':
2011-12-07 07:48:51 -08:00
The Android Open Source Project
99cad3edab Reconcile with ics-mr1-release
Change-Id: I05d0cefddf9ae17eb9e752486aa19e42744af34c
2011-12-07 07:44:55 -08:00
The Android Open Source Project
22db4f6b78 am 708947f1: am c3933b34: Reconcile with ics-mr0-release
* commit '708947f194c24d0e5c3ca8270134427e942d1964':
  Remove watchdog setting for poor network avoidance
2011-12-07 07:32:06 -08:00
The Android Open Source Project
708947f194 am c3933b34: Reconcile with ics-mr0-release
* commit 'c3933b34587e3c10269c05c2554e5a90ab4ce802':
  Remove watchdog setting for poor network avoidance
2011-12-07 07:29:36 -08:00
The Android Open Source Project
c3933b3458 Reconcile with ics-mr0-release
Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010
2011-12-07 07:25:12 -08:00
Jean Chalard
13a3f8a5f0 am 6b8e6585: Move adding word functionality to the new interface
* commit '6b8e6585c672dfee5b69d3b5b2f1c030acf95a22':
  Move adding word functionality to the new interface
2011-12-07 04:18:14 -08:00
Jean Chalard
6b8e6585c6 Move adding word functionality to the new interface
Step 4

Bug: 5306641
Change-Id: I150fd93e9802e92b4cf084867f0a9d1bc382cdae
2011-12-07 16:41:58 +09:00
Jean Chalard
31e55d2ae2 am 1800130f: Merge "Add the cancel button handler"
* commit '1800130ff19ce688d3c9d346fbd27a98134106ad':
  Add the cancel button handler
2011-12-06 19:10:21 -08:00
Jean Chalard
7594b9271b am 7aa017b1: Merge "Add the new add_word interface."
* commit '7aa017b1d36377d6b5635d1f9efc33286f667efe':
  Add the new add_word interface.
2011-12-06 19:08:34 -08:00
Jean Chalard
7755424bf8 am 21d7c261: Merge "Add a new activity for adding a user dictionary word"
* commit '21d7c261f3541db6de280a5b6dde9ebc02ec4853':
  Add a new activity for adding a user dictionary word
2011-12-06 19:08:33 -08:00
Jean Chalard
1800130ff1 Merge "Add the cancel button handler" 2011-12-06 19:07:42 -08:00
Jean Chalard
7aa017b1d3 Merge "Add the new add_word interface." 2011-12-06 19:07:30 -08:00
Jean Chalard
21d7c261f3 Merge "Add a new activity for adding a user dictionary word" 2011-12-06 19:07:05 -08:00
Jean Chalard
0824d31aea Add the cancel button handler
Step 3

Bug: 5306641
Change-Id: Ida4ccf181942714799576fde0ac55596ce043434
2011-12-07 12:05:58 +09:00
Jean Chalard
e17eefab87 Add the new add_word interface.
This is step 2. The interface is not functional yet.

Bug: 5306641
Change-Id: Idc8d07b883a17067f777c86d83994fb040b37c59
2011-12-07 11:48:19 +09:00
Jean Chalard
bd44e9d399 Add a new activity for adding a user dictionary word
This is step 1.

Bug: 5306641
Change-Id: I69727f05df8f3455e6e734140f712ccf7881e5be
2011-12-07 11:36:01 +09:00
Chia-chi Yeh
f5317a151b VpnSettings: add support for server certificates.
Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
2011-12-06 17:51:01 -08:00
The Android Automerger
c67a050c9e merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:59 -08:00
Irfan Sheriff
5f9fe33a8d am d29a4fd5: am 9ef669a6: am d03c1511: Remove watchdog setting for poor network avoidance
* commit 'd29a4fd5b7b5aa479820a5b69667a4ae8befde07':
  Remove watchdog setting for poor network avoidance
2011-12-06 16:19:44 -08:00
Irfan Sheriff
d29a4fd5b7 am 9ef669a6: am d03c1511: Remove watchdog setting for poor network avoidance
* commit '9ef669a65d6ecaabeb5cf1f8d342ae8032f6bfd5':
  Remove watchdog setting for poor network avoidance
2011-12-06 16:04:31 -08:00
Irfan Sheriff
cf52e07f53 Remove watchdog setting for poor network avoidance
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
2011-12-06 14:23:43 -08:00
Irfan Sheriff
9ef669a65d am d03c1511: Remove watchdog setting for poor network avoidance
* commit 'd03c15119d404d282ccc5fba257a6ca76962769c':
  Remove watchdog setting for poor network avoidance
2011-12-06 11:37:04 -08:00
Irfan Sheriff
d03c15119d Remove watchdog setting for poor network avoidance
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
2011-12-06 11:21:49 -08:00
Eric Fischer
d1f2cc9211 am 4d48c12f: am 5166860e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '4d48c12fff4ff0c0a3c456b3b260804a7b283084':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:45:16 -08:00
Eric Fischer
2421dc03e8 am 46ef9a10: am 5cee3120: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '46ef9a10a3f49ac269896fb8813882e894a17340':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:45:16 -08:00
Eric Fischer
4d48c12fff am 5166860e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5166860e0af455d3a60498eb9eae25a0aa4b447e':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:42:34 -08:00
Eric Fischer
46ef9a10a3 am 5cee3120: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '5cee3120246b37ffd9ab6756c198d3398b3e6ba7':
  Import revised translations.  DO NOT MERGE
2011-12-06 10:42:33 -08:00
Eric Fischer
5166860e0a Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:37:36 -08:00
Eric Fischer
5cee312024 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:37:09 -08:00
Svetoslav Ganov
eb6071bfd9 am 24f81a68: am 7e8dcbea: Adding a system preference whether to speak passwords in accessibility mode (settings).
* commit '24f81a68bbb4e4533c82627cd589602d4fc0c278':
  Adding a system preference whether to speak passwords in accessibility mode (settings).
2011-12-06 10:33:17 -08:00
Svetoslav Ganov
24f81a68bb am 7e8dcbea: Adding a system preference whether to speak passwords in accessibility mode (settings).
* commit '7e8dcbea65356807ca052ee5e98c9b25b7f0b1ca':
  Adding a system preference whether to speak passwords in accessibility mode (settings).
2011-12-06 10:31:05 -08:00
Eric Fischer
df387fe7f5 Import revised translations. DO NOT MERGE
Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e
2011-12-06 10:29:45 -08:00
Gilles Debunne
c79bf37621 Typos in CheckBoxAndSettingsPreference
Change-Id: Ied042582e3aa1ef8eb5f71b56e734c8889711080
2011-12-05 18:06:16 -08:00
Svetoslav Ganov
7e8dcbea65 Adding a system preference whether to speak passwords in accessibility mode (settings).
By default we do not speak passwords if the user has no headset. However,
many users find this too restrictive and would like a way to enable
password announcement. While we cannot speak the passwords all the time
,to avoid leaking them, we expose a preference so each user can choose
the option that best works for him/her.

bug:5712607

Change-Id: I1a6e95c392c18dc8d7406b1cef49705756b31254
2011-12-05 13:09:27 -08:00
The Android Open Source Project
4da0262996 am 5762db65: Reconcile with ics-mr1-release
* commit '5762db656ed7c13ca532a5c96c8c83ea7b941559':
2011-12-05 08:56:33 -08:00
The Android Open Source Project
5762db656e Reconcile with ics-mr1-release
Change-Id: If3e7c291746adfa9cd3b7696753f4846bdfc0d63
2011-12-05 08:53:42 -08:00
The Android Automerger
8fade5b963 merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 16:21:56 -08:00
Eric Fischer
7823baac40 Import revised translations. DO NOT MERGE
Change-Id: I8d5ff4f5f728e3c00b63a81740b707d9ac14fb32
2011-12-02 14:25:00 -08:00
Amith Yamasani
18190d1267 am 141a1def: am bbcc300c: Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1
* commit '141a1def9d6e44026bee6452c7bc24d32f7a44e7':
  Set the same vibrate settings for ringer and notifications.
2011-12-02 13:48:06 -08:00
Amith Yamasani
cd7aa7b826 am a942dfda: am fa81de9b: Merge "Potential fix for NPE in Running services." into ics-mr1
* commit 'a942dfdaf1f5004e8d58153a502f3900a912386f':
  Potential fix for NPE in Running services.
2011-12-02 13:48:05 -08:00
Gilles Debunne
846005bbff am 5a107635: am 1663522e: Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1
* commit '5a107635e5c9840305e99a983a73aa2bb6ed7151':
  Fixed layout for "Available Devices" in Bluetooth
2011-12-02 13:48:04 -08:00