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
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