Commit Graph

5549 Commits

Author SHA1 Message Date
Jean Chalard
60bca710ee Add the more options interface.
The interface is not functional yet, aside from the "Manage"
button. This will come in a later change.
Step 5

Bug: 5306641
Change-Id: I4bdea099eece7ba8a50bbfb47e173036334064ea
2011-12-08 12:33:15 +09:00
Irfan Sheriff
009c1cc19e Fix NPE in advanced settings
Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
2011-12-07 16:42:17 -08:00
Chia-chi Yeh
1cd0eba621 am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1
* commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
  VpnSettings: add support for server certificates.
2011-12-07 12:30:22 -08:00
Chia-chi Yeh
325c912ae6 Merge "VpnSettings: add support for server certificates." into ics-mr1 2011-12-07 12:26:52 -08:00
Irfan Sheriff
f15ae066c0 am 9daa7d95: am fec195d7: Fix NPE in advanced settings
* commit '9daa7d95ae49627c02d4aeb6da4e964b83eaf8dd':
  Fix NPE in advanced settings
2011-12-07 12:23:38 -08:00
Irfan Sheriff
9daa7d95ae am fec195d7: Fix NPE in advanced settings
* commit 'fec195d7564b489fcdd814d066cfbf6af702132b':
  Fix NPE in advanced settings
2011-12-07 12:20:27 -08:00
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
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
99cad3edab Reconcile with ics-mr1-release
Change-Id: I05d0cefddf9ae17eb9e752486aa19e42744af34c
2011-12-07 07:44:55 -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
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
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
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
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
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
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
141a1def9d am bbcc300c: Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1
* commit 'bbcc300c87d702aede31de311f88571b0caf9113':
  Set the same vibrate settings for ringer and notifications.
2011-12-02 13:44:16 -08:00
Amith Yamasani
a942dfdaf1 am fa81de9b: Merge "Potential fix for NPE in Running services." into ics-mr1
* commit 'fa81de9b9c561a73216f16b2fd62c6f2042b8090':
  Potential fix for NPE in Running services.
2011-12-02 13:44:15 -08:00
Gilles Debunne
5a107635e5 am 1663522e: Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1
* commit '1663522e1a835ac69f58d7764aebe935c679c288':
  Fixed layout for "Available Devices" in Bluetooth
2011-12-02 13:44:13 -08:00
Amith Yamasani
bbcc300c87 Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1 2011-12-02 10:43:58 -08:00
Amith Yamasani
fa81de9b9c Merge "Potential fix for NPE in Running services." into ics-mr1 2011-12-02 10:40:55 -08:00
The Android Automerger
f3fe48fc2c merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 10:26:02 -08:00
Gilles Debunne
1663522e1a Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1 2011-12-02 10:22:25 -08:00
Amith Yamasani
b71efad62e Potential fix for NPE in Running services.
Bug: 5698270

Loop was removing items from the list being iterated.

Change-Id: I39e98c554b2fe6024381afbe79b737b812e78f08
2011-12-02 10:15:27 -08:00
The Android Open Source Project
c2af71bf8f Reconcile with ics-mr1-release
Change-Id: Ie822c5e13c07e37c068402fd3b96bc588d528e62
2011-12-02 07:53:39 -08:00
Irfan Sheriff
8297cb3ab2 Merge "Add wifi direct settings UI" 2011-12-01 17:23:41 -08:00
Jim Miller
e711bf7c01 am 8266d1aa: Merge "Fix 5636798: Watch for SIM state changes in IccSettings." into ics-mr1
* commit '8266d1aa6b930a60be38fa5cbfe987f7e8280f70':
  Fix 5636798: Watch for SIM state changes in IccSettings.
2011-12-01 16:34:17 -08:00
Jim Miller
8266d1aa6b Merge "Fix 5636798: Watch for SIM state changes in IccSettings." into ics-mr1 2011-12-01 16:30:59 -08:00
Amith Yamasani
b3e6afe029 Set the same vibrate settings for ringer and notifications.
Bug: 5586083
Change-Id: I113488d9d7b9c5bafdd30f69f4002c5f4a2f89a7
2011-12-01 15:32:35 -08:00
The Android Automerger
7632bcdbb8 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:46:50 -08:00