Commit Graph

5439 Commits

Author SHA1 Message Date
Eric Fischer
cd6fc886ff am 2bccd7f4: Import revised translations. DO NOT MERGE
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
  Import revised translations. DO NOT MERGE
2011-12-13 10:52:31 -08:00
Eric Fischer
2bccd7f4a7 Import revised translations. DO NOT MERGE
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
2011-12-13 10:04:17 -08:00
Eric Fischer
74ddfbd658 am 080691ed: Import revised translations. DO NOT MERGE
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
  Import revised translations.  DO NOT MERGE
2011-12-12 11:08:36 -08:00
Eric Fischer
080691eda9 Import revised translations. DO NOT MERGE
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
2011-12-12 11:00:08 -08:00
Meng Hu
1f2890f8f3 am 3feacdf3: Add Sprint update menu
* commit '3feacdf3969800d6c53c6ca6f8ced2f8fc637f7f':
  Add Sprint update menu
2011-12-08 14:17:27 -08:00
Meng Hu
3feacdf396 Add Sprint update menu
Adds the conditionally used xml ui definition and removes it at runtime when it's not
wanted.  Ported from GB.

bug:5237167
Change-Id: I89a67e1033ddc7099563732e839c08fbadb4fd75
2011-12-08 13:00:35 -08:00
Eric Fischer
4305c887ea am d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'd59d7cb0914ff4fb8e0a6cf6f33c2fd2a27b6559':
  Import revised translations. DO NOT MERGE
2011-12-08 11:13:14 -08:00
Eric Fischer
d59d7cb091 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:58 -08:00
Eric Fischer
a5f26614c8 Import revised translations. DO NOT MERGE
Change-Id: If9d9c2cd72682251e2743543c8f6ee36b2c2da2a
2011-12-08 10:36:13 -08:00
The Android Open Source Project
f2a6adee46 am a961c06b: Reconcile with ics-mr0-release
* commit 'a961c06b9c0718406a72d71125aa0bf45d3c8659':
  Fix NPE in advanced settings
2011-12-08 10:28:58 -08:00
The Android Open Source Project
a961c06b9c Reconcile with ics-mr0-release
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc
2011-12-08 10:26:01 -08: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
d16197b87c am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1
* commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
  VpnSettings: add support for server certificates.
2011-12-07 12:28:40 -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
93de1e29eb am 9daa7d95: am fec195d7: Fix NPE in advanced settings
* commit '9daa7d95ae49627c02d4aeb6da4e964b83eaf8dd':
  Fix NPE in advanced settings
2011-12-07 12:22:10 -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
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
c3933b3458 Reconcile with ics-mr0-release
Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010
2011-12-07 07:25:12 -08:00
Chia-chi Yeh
f5317a151b VpnSettings: add support for server certificates.
Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
2011-12-06 17:51:01 -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
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
Eric Fischer
df387fe7f5 Import revised translations. DO NOT MERGE
Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e
2011-12-06 10:29:45 -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
Eric Fischer
7823baac40 Import revised translations. DO NOT MERGE
Change-Id: I8d5ff4f5f728e3c00b63a81740b707d9ac14fb32
2011-12-02 14:25:00 -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
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
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
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
Daniel Sandler
e9b79e3aad Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1 2011-11-30 19:56:33 -08:00
Jim Miller
113ae0258d Fix 5636798: Watch for SIM state changes in IccSettings.
This fixes a bug where the SIM enable checkbox was showing the
wrong state.   The code now registers for state changes and updates
the checkbox state appropriately.

Change-Id: Icd4f040140e9f71e75e288968ee7ae616dfd08ce
2011-11-30 19:16:31 -08:00
Amith Yamasani
24f0389b64 am 95b26e1a: Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
* commit '95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5':
  Overhaul vibrate and silent settings to match hard keys.
2011-11-30 19:06:11 -08:00
Amith Yamasani
95b26e1a4a Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1 2011-11-30 19:04:33 -08:00
Amith Yamasani
dfb654367d Overhaul vibrate and silent settings to match hard keys.
We go back to the old style of toggling between Mute/Vibrate/Normal.
There is an addition of a checkbox to indicate Vibrate on ring/notif.

Icons in volume dialogs are no longer touchable.

Bug: 5586083

This simplifies the logic in SoundSettings quite a bit, since there's a 1-1 mapping
with ringer mode.

Don't disable volume sliders when muted, so you can go to zero and back up by sliding
your finger. This is because the icons are not clickable anymore.

Change-Id: Ia7ce7e1bf108419eb107f03b7720101efe1598b1
2011-11-30 18:46:54 -08:00