PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,199 Commits 1 Branch 0 Tags
dbc7d9c7e5824f995cd410b3c102aed226650ea0
Commit Graph

6199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
The Android Open Source Project
139f2851c9 am c2af71bf: Reconcile with ics-mr1-release 
* commit 'c2af71bf8f3f58e07d8e53ab7809caf866ffd527':
 2011-12-02 07:56:58 -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
ea29d0b9e7 am 8297cb3a: Merge "Add wifi direct settings UI" 
* commit '8297cb3ab2dba776024cac40e66b1a479438286b':
  Add wifi direct settings UI
 2011-12-01 17:25:50 -08:00
Irfan Sheriff
8297cb3ab2 Merge "Add wifi direct settings UI" 2011-12-01 17:23:41 -08:00
Jim Miller
304e71bb41 am e711bf7c: am 8266d1aa: Merge "Fix 5636798: Watch for SIM state changes in IccSettings." into ics-mr1 
* commit 'e711bf7c017d6262297d8fc56716c7dbbb69e641':
  Fix 5636798: Watch for SIM state changes in IccSettings.
 2011-12-01 16:35:55 -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
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
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
46d460fd4c am 0d3e8d6a: Merge "Allowing FaceUnlock with a PIN fixes 5467194" 
* commit '0d3e8d6acb93b5306ff3d8a25e32b7de87d95363':
  Allowing FaceUnlock with a PIN fixes 5467194
 2011-11-30 20:49:37 -08:00
Steven Ross
0d3e8d6acb Merge "Allowing FaceUnlock with a PIN fixes 5467194" 2011-11-30 20:48:23 -08:00
Daniel Sandler
54e14bcfff am 79ec715f: am e9b79e3a: (-s ours) Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1 
* commit '79ec715f43cfe40d62e3f839e0bcb8152bc4eee7':
  Pulling screen savers for now. DO NOT MERGE.
 2011-11-30 20:01:53 -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
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
dc1a685b90 am 827c3d69: am 95b26e1a: Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1 
* commit '827c3d6943f7cdc3ddbe40551f813e6865595e50':
  Overhaul vibrate and silent settings to match hard keys.
 2011-11-30 19:10:55 -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
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
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
0f16de2ce1 am 7129322d: Reconcile with ics-mr1-release 
* commit '7129322d0685059e925fc692ef9b1c48c5ff3128':
 2011-11-30 14:05:10 -08:00
Daniel Sandler
caa01c1a25 am cfd97b59: am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1 
* commit 'cfd97b59f222f2b56fd90fcd4c0bf65023d59724':
  Show screen saver toggle on tablets.
 2011-11-30 14:03:42 -08: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
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
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
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
9624142944 am 22c79cfa: am 21b5d18b: (-s ours) Import revised translations. DO NOT MERGE 
* commit '22c79cfa1b7298dfb6a90881fbc801fa652b916f':
  Import revised translations.  DO NOT MERGE
 2011-11-29 13:36:11 -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
e6efb9408c am b5023d25: Import revised translations. 
* commit 'b5023d25d2c0cd21c9843567a2cafb009111d72d':
  Import revised translations.
 2011-11-29 11:56:45 -08:00
Eric Fischer
b5023d25d2 Import revised translations. 
Change-Id: I057d4f0cafa5d08e4048e4fd437e69a023f5edb7
 2011-11-29 11:19:18 -08:00