Commit Graph

5468 Commits

Author SHA1 Message Date
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
Steven Ross
0d3e8d6acb Merge "Allowing FaceUnlock with a PIN fixes 5467194" 2011-11-30 20:48:23 -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
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
827c3d6943 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:08:33 -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
Steven Ross
94c0548224 Allowing FaceUnlock with a PIN fixes 5467194
We need to allow FaceUnlock if the backup lock supports encryption (PIN).
This requires changing the way the minimum encryption quality is enforced
to allow FaceUnlock as long as the backup lock is a PIN, as FaceUnlock
is considered a lower security than the minimum for encrypted drives.
This change adds some complexity to upgradeQualityForEncryption because it's
used in two places: once to grey out selections that aren't sufficient
security level, and second to force the user to use a higher security level.
This still increases the minimum security level,
but makes an exception for FaceUnlock if it's allowed without encryption.

This uses a MutableBoolean to provide a mutable boolean capability.
We could instead write a custom one or use some other type of mutable
boolean if it exists.

In CryptKeeperSettings, using getKeyguardStoredPasswordQuality directly instead
of getActivePasswordQuality is simpler, but this uses a more complex approach
with a minor tweak as jaggies suggested it and it is clear about the
biometric exception being made.

Change-Id: Ia2645d6bd98857c79c6a9be45eda98087bfe517a
2011-11-30 19:48:38 -05:00
The Android Open Source Project
7129322d06 Reconcile with ics-mr1-release
Change-Id: Idbff6b6c73a4e5c68769504f39b47239df431476
2011-11-30 12:56:18 -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
cfd97b59f2 am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1
* commit 'a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
  Show screen saver toggle on tablets.
2011-11-30 10:50:54 -08:00
The Android Automerger
708342cff2 merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:46:56 -08:00
Daniel Sandler
a6ff69ede0 Merge "Show screen saver toggle on tablets." into ics-mr1 2011-11-29 18:18:29 -08:00
Irfan Sheriff
8c2ac71b34 Add wifi direct settings UI
- Use switch for toggling
- Follow string and UI suggestions from UX folks

The goal is to keep the interaction minimal - PBC is used when possible and keypad/display
are used only if really necessary

Bug: 5332330
Change-Id: I83e91ad3a393c143e70f1f2b6a842b95eacde404
2011-11-29 15:43:20 -08:00
Eric Fischer
22c79cfa1b am 21b5d18b: (-s ours) Import revised translations. DO NOT MERGE
* commit '21b5d18bcbb15ce2571aab8b60a7aca8971ef7a7':
  Import revised translations.  DO NOT MERGE
2011-11-29 13:32:41 -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
Eric Fischer
b5023d25d2 Import revised translations.
Change-Id: I057d4f0cafa5d08e4048e4fd437e69a023f5edb7
2011-11-29 11:19:18 -08:00
The Android Automerger
9192b0a7c0 merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:23:11 -08:00
The Android Open Source Project
51adfd9c8b Reconcile with ics-mr1-release
Change-Id: I078f0b904d665abe2050b986b952bc714a706019
2011-11-22 13:26:28 -08:00
The Android Automerger
eaec27fd16 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:57:00 -08: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
800a0a426d 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 21:08:31 -08:00
Eric Fischer
68f6312f88 am 2e2c4990: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '2e2c49901f103c148696caffcc451bf0def90d06':
  Import revised translations. DO NOT MERGE
2011-11-21 21:08:01 -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
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
9e61c175fe am 6f0ea441: Settings changes for Android Dreams (now Screen Candy).
* commit '6f0ea441e465a0af646f8952f820a92f6902c8d9':
  Settings changes for Android Dreams (now Screen Candy).
2011-11-19 20:46:41 -08:00
The Android Open Source Project
428456184d Reconcile with ics-mr1-release
Change-Id: I9295aacf40f2ad4c8a2bd6fff1a5366b0519448c
2011-11-18 15:43:40 -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