Commit Graph

6473 Commits

Author SHA1 Message Date
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
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
1a63464b53 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 10:45:31 -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
9f1f732821 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 10:42:45 -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
7587b89ca9 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 10:24:47 -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
139f2851c9 am c2af71bf: Reconcile with ics-mr1-release
* commit 'c2af71bf8f3f58e07d8e53ab7809caf866ffd527':
2011-12-02 07:56:58 -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
ea29d0b9e7 am 8297cb3a: Merge "Add wifi direct settings UI"
* commit '8297cb3ab2dba776024cac40e66b1a479438286b':
  Add wifi direct settings UI
2011-12-01 17:25:50 -08:00
Irfan Sheriff
8297cb3ab2 Merge "Add wifi direct settings UI" 2011-12-01 17:23:41 -08:00
Jim Miller
304e71bb41 am e711bf7c: am 8266d1aa: Merge "Fix 5636798: Watch for SIM state changes in IccSettings." into ics-mr1
* commit 'e711bf7c017d6262297d8fc56716c7dbbb69e641':
  Fix 5636798: Watch for SIM state changes in IccSettings.
2011-12-01 16:35:55 -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
20eff59feb 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:32:20 -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
Steven Ross
46d460fd4c am 0d3e8d6a: Merge "Allowing FaceUnlock with a PIN fixes 5467194"
* commit '0d3e8d6acb93b5306ff3d8a25e32b7de87d95363':
  Allowing FaceUnlock with a PIN fixes 5467194
2011-11-30 20:49:37 -08:00
Steven Ross
0d3e8d6acb Merge "Allowing FaceUnlock with a PIN fixes 5467194" 2011-11-30 20:48:23 -08:00
Daniel Sandler
54e14bcfff am 79ec715f: am e9b79e3a: (-s ours) Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1
* commit '79ec715f43cfe40d62e3f839e0bcb8152bc4eee7':
  Pulling screen savers for now. DO NOT MERGE.
2011-11-30 20:01:53 -08:00
Daniel Sandler
79ec715f43 am e9b79e3a: (-s ours) Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1
* commit 'e9b79e3aade7c51dee8ec9ef263c53c166a591c6':
  Pulling screen savers for now. DO NOT MERGE.
2011-11-30 20:00:25 -08:00
Daniel Sandler
5a0d052788 am e9b79e3a: Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1
* commit 'e9b79e3aade7c51dee8ec9ef263c53c166a591c6':
  Pulling screen savers for now. DO NOT MERGE.
2011-11-30 19:58:04 -08:00