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

6319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
afb749db03 am 51adfd9c: Reconcile with ics-mr1-release 
* commit '51adfd9c8b652f3c1ef176abf3788e5e27f56712':
 2011-11-22 13:29:32 -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
13d922b62c am 800a0a42: am 2fa017f8: Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1 
* commit '800a0a426d3536b667887ca47bee3181805858cf':
  fix datetime layout for phones and remove orientation locking
 2011-11-21 21:16:17 -08:00
Eric Fischer
e3f0457a9b am 68f6312f: am 2e2c4990: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '68f6312f880c762726ee552d7d7b9031160d8fb4':
  Import revised translations. DO NOT MERGE
 2011-11-21 21:16:16 -08: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
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
97fbe9e1a4 am 9e61c175: am 6f0ea441: Settings changes for Android Dreams (now Screen Candy). 
* commit '9e61c175fe3f9635dd91656af068de3daf399a68':
  Settings changes for Android Dreams (now Screen Candy).
 2011-11-19 20:48:20 -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
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
The Android Open Source Project
c33374cfc1 am 42845618: Reconcile with ics-mr1-release 
* commit '428456184d90956315abcba69bf0cd50065fb8b9':
 2011-11-18 15:46:35 -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
Daniel Sandler
4de08b4495 am af7de91c: am cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1 
* commit 'af7de91c0c24dc553b5121748ed2c91e89d8aff8':
  Show desk dock apps as screen savers.
 2011-11-17 11:48:58 -08:00
Daniel Sandler
af7de91c0c am cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1 
* commit 'cee089b1526e27b9b96dbeb9549199b0f8a78c9b':
  Show desk dock apps as screen savers.
 2011-11-17 11:46:24 -08:00
The Android Automerger
61aba049ac merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:47:21 -08:00
Eric Fischer
4a6e5390ef am 122040e1: am bae10f7b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '122040e19ddb476d0f634cd80eb1bb0bfff7da2f':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:50:55 -08:00
Freeman Ng
281ff4a4ff am c303ade1: am fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1 
* commit 'c303ade15b6bde5e5ed3e3da03fb0b8616261dc3':
  fix npe when launching datetime settings for phone setup wizard
 2011-11-17 05:50:55 -08:00
Eric Fischer
122040e19d am bae10f7b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'bae10f7b3b5f3e5e860e5f0ca91f045a41a023c3':
  Import revised translations.  DO NOT MERGE
 2011-11-17 05:45:39 -08:00
Freeman Ng
c303ade15b am fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1 
* commit 'fd2daf6a716006ba0b0243c523e440999610076a':
  fix npe when launching datetime settings for phone setup wizard
 2011-11-17 05:45:36 -08:00
The Android Open Source Project
21699e221d am aa6677e9: am 0d59935d: am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit 'aa6677e9435c55dd8b7ab7996c5a0c77058d4b83':
 2011-11-17 04:12:56 -08:00
The Android Open Source Project
aa6677e943 am 0d59935d: am c90961d4: Reconcile with ics-factoryrom-2-release 
* commit '0d59935d301cc782cca03bda32f4f98e7a294b08':
 2011-11-17 04:08:35 -08:00