Commit Graph

5424 Commits

Author SHA1 Message Date
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
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
Daniel Sandler
1e219778ed Pulling screen savers for now. DO NOT MERGE.
Bug: 5689684
Change-Id: Ida6f23484c91d1cde539fc4a64e467970fa1fdb3
2011-11-30 14:32:53 -05:00
Daniel Sandler
aefdf06038 am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1
* commit 'a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
  Show screen saver toggle on tablets.
2011-11-29 18:19:43 -08:00
Daniel Sandler
a6ff69ede0 Merge "Show screen saver toggle on tablets." into ics-mr1 2011-11-29 18:18:29 -08:00
Eric Fischer
684b06fa5e am 21b5d18b: Import revised translations. DO NOT MERGE
* commit '21b5d18bcbb15ce2571aab8b60a7aca8971ef7a7':
  Import revised translations.  DO NOT MERGE
2011-11-29 14:30:24 -08:00
Eric Fischer
21b5d18bcb Import revised translations. DO NOT MERGE
Change-Id: Ia5368f1dffbd304e7b95d91f2a64acdc76381fa6
2011-11-29 13:18:54 -08:00
Daniel Sandler
c949ef6e64 Show screen saver toggle on tablets.
Bug: 5669263
Change-Id: I16ca00ff96b17cc367c4f6fa4260da5a08480ac0
2011-11-29 16:10:41 -05:00
Gilles Debunne
648f4f6688 Fixed layout for "Available Devices" in Bluetooth
Bug 5646340.

'Title' and 'scanning' text are on the same line as a PreferenceCategory.
The first one has a 0dp width, compensated by a 1 weight.

When scanning is not displayed, it should be GONE rather than INVISIBLE
to let the title take the whole space.

When both are visible, they should split the space, or else, with long
texts in foreign languages, scanning takes the whole space, leaving the
title with an almost 0 width that generates a very high text because
of wrapping.

Distributing size among the two texts to accomodate for such cases.

Changed padding and alignment to get reasonnable results for Slovenian
language (i.e. very long text), when both title and scanning are displayed.

Strangely, the right scanning alignment is not enforced, although I checked
it is correctly set on the TextView. Not investigating further now since it
may not be desired by UX anyway.

Change-Id: I6b4c6fcbc350d3664749f58eee34ec0867720626
2011-11-22 10:45:18 +01:00
Freeman Ng
c829ea0bb9 am 2fa017f8: Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1
* commit '2fa017f874d20a5b037ebe57f3fc0c53964080bc':
  fix datetime layout for phones and remove orientation locking
2011-11-21 16:07:54 -08:00
Freeman Ng
2fa017f874 Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1 2011-11-21 16:05:45 -08:00
Eric Fischer
84767b9fa4 am 2e2c4990: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '2e2c49901f103c148696caffcc451bf0def90d06':
  Import revised translations. DO NOT MERGE
2011-11-21 15:27:06 -08:00
Eric Fischer
2e2c49901f Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-21 15:23:37 -08:00
Eric Fischer
27ae11dfd5 Import revised translations. DO NOT MERGE
Change-Id: Ibf7154e471cba15745a917bffe4cf49f2f01aebb
2011-11-21 15:02:49 -08:00
Freeman Ng
5a82528089 fix datetime layout for phones and remove orientation locking
The first fixes the bug, the second was something I noticed
while debugging. We're no longer locking setup wizard orientation
for anything screen size, and so no activities it calls needs
to do that any more, either.

bug: 5642402
Change-Id: I5911223112a19841f6b4754a70148f28a753f736
2011-11-21 14:47:02 -08:00
Daniel Sandler
edcad7bcbb am 6f0ea441: Settings changes for Android Dreams (now Screen Candy).
* commit '6f0ea441e465a0af646f8952f820a92f6902c8d9':
  Settings changes for Android Dreams (now Screen Candy).
2011-11-19 20:44:34 -08:00
Daniel Sandler
6f0ea441e4 Settings changes for Android Dreams (now Screen Candy).
- new preference design
- remove candy-specific timeout
- use new settings keys

Requires Change I31f31b3

Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6
2011-11-17 21:06:29 -08:00