OSDN Git Service
The Android Automerger [Tue, 13 Dec 2011 15:00:57 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
The Android Open Source Project [Tue, 13 Dec 2011 13:40:55 +0000 (05:40 -0800)]
am
bb712edd: Reconcile with ics-mr1-release
* commit '
bb712edde58d3b4069bb7f1f63895522ce651579':
The Android Open Source Project [Tue, 13 Dec 2011 13:12:02 +0000 (05:12 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60
Jean Chalard [Tue, 13 Dec 2011 11:45:57 +0000 (20:45 +0900)]
Wording fix
Bug:
5306641
Change-Id: I11c404bd5d093149f044546363245ebb50e1b195
The Android Automerger [Tue, 13 Dec 2011 06:09:28 +0000 (22:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Mon, 12 Dec 2011 23:39:21 +0000 (15:39 -0800)]
am
efbb9c5d: (-s ours) am
080691ed: Import revised translations. DO NOT MERGE
* commit '
efbb9c5d9d56e7f9d62b32014d0361ed8a87990b':
Import revised translations. DO NOT MERGE
The Android Open Source Project [Mon, 12 Dec 2011 23:30:00 +0000 (15:30 -0800)]
am
71ca5e4c: Reconcile with ics-mr1-release
* commit '
71ca5e4c62283a4adc10a77356ed98c7fb7b8647':
Eric Fischer [Mon, 12 Dec 2011 19:06:39 +0000 (11:06 -0800)]
am
080691ed: Import revised translations. DO NOT MERGE
* commit '
080691eda9be32e090ed9abba1cc6fa0047b51fd':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 12 Dec 2011 19:00:08 +0000 (11:00 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
The Android Automerger [Mon, 12 Dec 2011 15:01:02 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
Meng Hu [Sat, 10 Dec 2011 02:09:22 +0000 (18:09 -0800)]
am
1d015e49: am
3feacdf3: Add Sprint update menu
* commit '
1d015e49fcb3e15c8a64d1911c80b66e544fa25f':
Add Sprint update menu
Eric Fischer [Fri, 9 Dec 2011 22:58:13 +0000 (14:58 -0800)]
am
32c49f1a: (-s ours) am
d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
32c49f1ad7897fdf9dfc161b60f723355a93e6bb':
Import revised translations. DO NOT MERGE
The Android Open Source Project [Fri, 9 Dec 2011 22:58:04 +0000 (14:58 -0800)]
The Android Open Source Project [Fri, 9 Dec 2011 22:57:47 +0000 (14:57 -0800)]
am
018e0819: Reconcile with ics-mr0-release ics-mr1-release
* commit '
018e08197e1891d6985bf1261826de4cf60b18b1':
Fix NPE in advanced settings
The Android Open Source Project [Fri, 9 Dec 2011 15:11:40 +0000 (07:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaa494a9536a8a244bcb4050d78e7dc15dc8460f0
Jean Chalard [Fri, 9 Dec 2011 03:59:53 +0000 (12:59 +0900)]
Fix a bug where extract UI would be used
Step 10
Bug:
5306641
Change-Id: Ic91f25cd4304b513d9d0ad931f7a9cc53e08f975
Jean Chalard [Fri, 9 Dec 2011 06:18:35 +0000 (15:18 +0900)]
Remove the shortcut textbox for now.
We'll reactivate it when it's supported by the system.
Step 11
Bug:
5306641
Change-Id: Ib6a673cec3c59d7396d67539940d566c122562ac
The Android Automerger [Fri, 9 Dec 2011 01:36:03 +0000 (17:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Claudia de Veaux [Fri, 9 Dec 2011 01:19:56 +0000 (17:19 -0800)]
Edits to strings per UI text standards.
We've been finessing some of these standards.
* Use ending punctuation for notification messages, and other messages, if a complete sentence.
* For confirmation messages needing a title, ask the question in the title and put the additional information in the message body.
* Use "choose" instead of "select" when asking the user to pick from options.
* Use "syncing" instead of "synchronizing".
* Don't use ending punctuation for setting summary text.
* Use contractions whenever possible.
* Try not to use the bang!
* Don't use "fail" in user-facing messages.
Bug:
5165745
Bug:
5163232
Bug:
5162667
Change-Id: Iafb9f8d7e93d11f2a0b04e9886bedb8981f62ce9
Meng Hu [Thu, 8 Dec 2011 22:18:03 +0000 (14:18 -0800)]
am
3feacdf3: Add Sprint update menu
* commit '
3feacdf3969800d6c53c6ca6f8ced2f8fc637f7f':
Add Sprint update menu
Meng Hu [Sun, 27 Nov 2011 05:06:40 +0000 (23:06 -0600)]
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
Gilles Debunne [Thu, 8 Dec 2011 19:17:05 +0000 (11:17 -0800)]
Merge "Typos in CheckBoxAndSettingsPreference"
Eric Fischer [Thu, 8 Dec 2011 19:13:18 +0000 (11:13 -0800)]
am
d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
d59d7cb0914ff4fb8e0a6cf6f33c2fd2a27b6559':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Dec 2011 19:09:58 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 18:36:13 +0000 (10:36 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If9d9c2cd72682251e2743543c8f6ee36b2c2da2a
The Android Open Source Project [Thu, 8 Dec 2011 18:29:03 +0000 (10:29 -0800)]
am
a961c06b: Reconcile with ics-mr0-release
* commit '
a961c06b9c0718406a72d71125aa0bf45d3c8659':
The Android Open Source Project [Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc
The Android Open Source Project [Thu, 8 Dec 2011 18:22:18 +0000 (10:22 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I410c510ccb55648d119fe4638cecbe87f25df94b
The Android Automerger [Thu, 8 Dec 2011 15:01:43 +0000 (07:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 8 Dec 2011 15:00:47 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
Jean Chalard [Tue, 6 Dec 2011 09:40:11 +0000 (18:40 +0900)]
Add an option to show the whole language list
The option is not functional yet.
Also, this change simplifies a little the inner workings by
preventing mLocale from being null.
Step 9
Bug:
5306641
Change-Id: Id2284976d34d9d8ac61cbdb2348893989c47da84
Jean Chalard [Mon, 5 Dec 2011 11:20:19 +0000 (20:20 +0900)]
Add functionality to the spinner.
With this, the word is actually inserted with the right locale
inside the user dictionary.
Step 8.
Bug:
5306641
Change-Id: Idf6cf3dd807e86c29faf8a701c03c1e6ea39ec68
Jean Chalard [Mon, 5 Dec 2011 11:19:36 +0000 (20:19 +0900)]
Small refactoring to make the next diff smaller
Step 7
Bug:
5306641
Change-Id: If5454679252a54670c501d3a63e9e4bd45028c44
Jean Chalard [Mon, 5 Dec 2011 10:34:53 +0000 (19:34 +0900)]
Populate the locale list
This populates the language list. The option looks like it works,
but is not implemented yet.
Step 6.
Bug:
5306641
Change-Id: I6ef84dea9a26e450add1d91b44238d86fe49200a
Jean Chalard [Thu, 8 Dec 2011 08:53:57 +0000 (00:53 -0800)]
Merge "Add the more options interface."
Jean Chalard [Mon, 5 Dec 2011 09:01:52 +0000 (18:01 +0900)]
Add the more options interface.
The interface is not functional yet, aside from the "Manage"
button. This will come in a later change.
Step 5
Bug:
5306641
Change-Id: I4bdea099eece7ba8a50bbfb47e173036334064ea
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings
Bug:
5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
Chia-chi Yeh [Wed, 7 Dec 2011 20:30:22 +0000 (12:30 -0800)]
am
325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1
* commit '
325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
VpnSettings: add support for server certificates.
Chia-chi Yeh [Wed, 7 Dec 2011 20:26:52 +0000 (12:26 -0800)]
Merge "VpnSettings: add support for server certificates." into ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 20:23:38 +0000 (12:23 -0800)]
am
9daa7d95: am
fec195d7: Fix NPE in advanced settings
* commit '
9daa7d95ae49627c02d4aeb6da4e964b83eaf8dd':
Fix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 20:20:27 +0000 (12:20 -0800)]
am
fec195d7: Fix NPE in advanced settings
* commit '
fec195d7564b489fcdd814d066cfbf6af702132b':
Fix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 20:12:59 +0000 (12:12 -0800)]
am
7d10591a: Fix NPE in advanced settings
* commit '
7d10591a3b3c05019260d11f196a5ad742d3685d':
Fix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings
Bug:
5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings
Bug:
5723974
Change-Id: I9904b6adb2b51f1511f932ef7cba8f6558417061
The Android Open Source Project [Wed, 7 Dec 2011 15:44:55 +0000 (07:44 -0800)]
Reconcile with ics-mr1-release
Change-Id: I05d0cefddf9ae17eb9e752486aa19e42744af34c
The Android Open Source Project [Wed, 7 Dec 2011 15:29:36 +0000 (07:29 -0800)]
am
c3933b34: Reconcile with ics-mr0-release
* commit '
c3933b34587e3c10269c05c2554e5a90ab4ce802':
Remove watchdog setting for poor network avoidance
The Android Open Source Project [Wed, 7 Dec 2011 15:25:12 +0000 (07:25 -0800)]
Reconcile with ics-mr0-release
Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010
The Android Automerger [Wed, 7 Dec 2011 15:01:15 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
Jean Chalard [Fri, 2 Dec 2011 10:15:47 +0000 (19:15 +0900)]
Move adding word functionality to the new interface
Step 4
Bug:
5306641
Change-Id: I150fd93e9802e92b4cf084867f0a9d1bc382cdae
Jean Chalard [Wed, 7 Dec 2011 03:07:42 +0000 (19:07 -0800)]
Merge "Add the cancel button handler"
Jean Chalard [Wed, 7 Dec 2011 03:07:30 +0000 (19:07 -0800)]
Merge "Add the new add_word interface."
Jean Chalard [Wed, 7 Dec 2011 03:07:05 +0000 (19:07 -0800)]
Merge "Add a new activity for adding a user dictionary word"
Jean Chalard [Fri, 2 Dec 2011 08:47:09 +0000 (17:47 +0900)]
Add the cancel button handler
Step 3
Bug:
5306641
Change-Id: Ida4ccf181942714799576fde0ac55596ce043434
Jean Chalard [Fri, 2 Dec 2011 05:56:39 +0000 (14:56 +0900)]
Add the new add_word interface.
This is step 2. The interface is not functional yet.
Bug:
5306641
Change-Id: Idc8d07b883a17067f777c86d83994fb040b37c59
Jean Chalard [Wed, 30 Nov 2011 11:51:20 +0000 (20:51 +0900)]
Add a new activity for adding a user dictionary word
This is step 1.
Bug:
5306641
Change-Id: I69727f05df8f3455e6e734140f712ccf7881e5be
Chia-chi Yeh [Wed, 7 Dec 2011 01:51:01 +0000 (17:51 -0800)]
VpnSettings: add support for server certificates.
Bug:
5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
The Android Automerger [Wed, 7 Dec 2011 00:54:59 +0000 (16:54 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 00:04:31 +0000 (16:04 -0800)]
am
9ef669a6: am
d03c1511: Remove watchdog setting for poor network avoidance
* commit '
9ef669a65d6ecaabeb5cf1f8d342ae8032f6bfd5':
Remove watchdog setting for poor network avoidance
Irfan Sheriff [Tue, 6 Dec 2011 19:21:49 +0000 (11:21 -0800)]
Remove watchdog setting for poor network avoidance
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
Irfan Sheriff [Tue, 6 Dec 2011 19:37:04 +0000 (11:37 -0800)]
am
d03c1511: Remove watchdog setting for poor network avoidance
* commit '
d03c15119d404d282ccc5fba257a6ca76962769c':
Remove watchdog setting for poor network avoidance
Irfan Sheriff [Tue, 6 Dec 2011 19:21:49 +0000 (11:21 -0800)]
Remove watchdog setting for poor network avoidance
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
Eric Fischer [Tue, 6 Dec 2011 18:42:34 +0000 (10:42 -0800)]
am
5166860e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
5166860e0af455d3a60498eb9eae25a0aa4b447e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 6 Dec 2011 18:42:33 +0000 (10:42 -0800)]
am
5cee3120: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
5cee3120246b37ffd9ab6756c198d3398b3e6ba7':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 6 Dec 2011 18:37:36 +0000 (10:37 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:37:09 +0000 (10:37 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Tue, 6 Dec 2011 18:31:05 +0000 (10:31 -0800)]
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).
Eric Fischer [Tue, 6 Dec 2011 18:29:45 +0000 (10:29 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e
Gilles Debunne [Fri, 2 Dec 2011 21:29:31 +0000 (13:29 -0800)]
Typos in CheckBoxAndSettingsPreference
Change-Id: Ied042582e3aa1ef8eb5f71b56e734c8889711080
Svetoslav Ganov [Mon, 5 Dec 2011 20:54:53 +0000 (12:54 -0800)]
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
The Android Open Source Project [Mon, 5 Dec 2011 16:53:42 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: If3e7c291746adfa9cd3b7696753f4846bdfc0d63
The Android Automerger [Mon, 5 Dec 2011 15:01:10 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
The Android Automerger [Sat, 3 Dec 2011 00:21:56 +0000 (16:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 1 Dec 2011 17:57:29 +0000 (09:57 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8d5ff4f5f728e3c00b63a81740b707d9ac14fb32
Amith Yamasani [Fri, 2 Dec 2011 21:44:16 +0000 (13:44 -0800)]
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.
Amith Yamasani [Fri, 2 Dec 2011 21:44:15 +0000 (13:44 -0800)]
am
fa81de9b: Merge "Potential fix for NPE in Running services." into ics-mr1
* commit '
fa81de9b9c561a73216f16b2fd62c6f2042b8090':
Potential fix for NPE in Running services.
Gilles Debunne [Fri, 2 Dec 2011 21:44:13 +0000 (13:44 -0800)]
am
1663522e: Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1
* commit '
1663522e1a835ac69f58d7764aebe935c679c288':
Fixed layout for "Available Devices" in Bluetooth
Amith Yamasani [Fri, 2 Dec 2011 18:43:58 +0000 (10:43 -0800)]
Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1
Amith Yamasani [Fri, 2 Dec 2011 18:40:55 +0000 (10:40 -0800)]
Merge "Potential fix for NPE in Running services." into ics-mr1
The Android Automerger [Fri, 2 Dec 2011 18:26:02 +0000 (10:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 18:22:25 +0000 (10:22 -0800)]
Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1
Amith Yamasani [Fri, 2 Dec 2011 18:15:27 +0000 (10:15 -0800)]
Potential fix for NPE in Running services.
Bug:
5698270
Loop was removing items from the list being iterated.
Change-Id: I39e98c554b2fe6024381afbe79b737b812e78f08
The Android Open Source Project [Fri, 2 Dec 2011 15:53:39 +0000 (07:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie822c5e13c07e37c068402fd3b96bc588d528e62
Irfan Sheriff [Fri, 2 Dec 2011 01:23:41 +0000 (17:23 -0800)]
Merge "Add wifi direct settings UI"
Jim Miller [Fri, 2 Dec 2011 00:34:17 +0000 (16:34 -0800)]
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.
Jim Miller [Fri, 2 Dec 2011 00:30:59 +0000 (16:30 -0800)]
Merge "Fix
5636798: Watch for SIM state changes in IccSettings." into ics-mr1
Amith Yamasani [Thu, 1 Dec 2011 23:32:35 +0000 (15:32 -0800)]
Set the same vibrate settings for ringer and notifications.
Bug:
5586083
Change-Id: I113488d9d7b9c5bafdd30f69f4002c5f4a2f89a7
The Android Automerger [Thu, 1 Dec 2011 15:01:13 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
The Android Automerger [Thu, 1 Dec 2011 14:46:50 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Steven Ross [Thu, 1 Dec 2011 04:48:23 +0000 (20:48 -0800)]
Merge "Allowing FaceUnlock with a PIN fixes
5467194"
Daniel Sandler [Thu, 1 Dec 2011 04:00:25 +0000 (20:00 -0800)]
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.
Daniel Sandler [Thu, 1 Dec 2011 03:56:33 +0000 (19:56 -0800)]
Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1
Jim Miller [Thu, 1 Dec 2011 03:16:31 +0000 (19:16 -0800)]
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
Amith Yamasani [Thu, 1 Dec 2011 03:08:33 +0000 (19:08 -0800)]
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.
Amith Yamasani [Thu, 1 Dec 2011 03:04:33 +0000 (19:04 -0800)]
Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
Amith Yamasani [Wed, 30 Nov 2011 00:38:14 +0000 (16:38 -0800)]
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
Steven Ross [Fri, 11 Nov 2011 18:35:09 +0000 (13:35 -0500)]
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
The Android Open Source Project [Wed, 30 Nov 2011 20:56:18 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idbff6b6c73a4e5c68769504f39b47239df431476
Daniel Sandler [Wed, 30 Nov 2011 19:09:47 +0000 (14:09 -0500)]
Pulling screen savers for now. DO NOT MERGE.
Bug:
5689684
Change-Id: Ida6f23484c91d1cde539fc4a64e467970fa1fdb3
Daniel Sandler [Wed, 30 Nov 2011 18:50:54 +0000 (10:50 -0800)]
am
a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1
* commit '
a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
Show screen saver toggle on tablets.
The Android Automerger [Wed, 30 Nov 2011 15:01:15 +0000 (07:01 -0800)]
merge in ics-release history after reset to master