Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,470 Commits 1 Branch 0 Tags
bb43919bbbdf0ebe416f3388d734a2d60e00ea21
Commit Graph

2146 Commits

Author SHA1 Message Date
Eric Fischer
bb43919bbb Import translations. DO NOT MERGE 
Change-Id: Ie27bb5431e3356c30867fc25d00037b3b567da5c
 2012-03-19 14:28:34 -07:00
Jason Chen
80f2b06330 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings" 
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
 2012-03-16 16:33:10 -07:00
Jason Chen
d5f7e6cd6b [DO NOT MERGE] Revert "Update string in Settings" 
This reverts commit 23d0b5287a.
 2012-03-16 16:18:51 -07:00
Jason Chen
800d263c2d am 23d0b528: Update string in Settings 
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
 2012-03-16 14:16:49 -07:00
Jason Chen
23d0b5287a Update string in Settings 
Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
 2012-03-16 11:31:19 -07:00
Eric Fischer
3c7aec3d0b am 78ef5443: Import translations. DO NOT MERGE 
* commit '78ef5443a66ee01d75d89227bfd078706184662c':
  Import translations. DO NOT MERGE
 2012-02-10 10:30:30 -08:00
Eric Fischer
78ef5443a6 Import translations. DO NOT MERGE 
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
 2012-02-08 19:08:43 -08:00
Eric Fischer
02a9c083d0 Import translations. DO NOT MERGE 
Change-Id: I1191d74a9998461cd673918e425c25fc8753f0f5
 2012-02-06 12:42:15 -08:00
Eric Fischer
6e7eac8e81 Import translations. DO NOT MERGE 
Change-Id: I3b212608cb7a1ac013eb37ff57092adf8680a439
 2012-02-03 12:45:11 -08:00
Eric Fischer
297231ca4f resolved conflicts for merge of 67a50f99 to ics-aah 
Change-Id: I14ffa78c503c91b615e353941a79ea0f8a85bb5a
 2012-02-02 14:02:44 -08:00
Eric Fischer
67a50f99d8 Import translations. DO NOT MERGE 
Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
 2012-02-02 12:54:15 -08:00
Eric Fischer
3fe72b1bf1 Import translations. DO NOT MERGE 
Change-Id: I0440527327af6700c034209be183979e9d682fd2
 2012-02-02 12:53:33 -08:00
Eric Fischer
1ab0cb8749 Import translations. DO NOT MERGE 
Change-Id: Ib5f8ddec20efbe7719bbb5e53d4cee47a31cb2e8
 2012-01-31 16:18:05 -08:00
Jim Miller
659fffcda2 am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 
* commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5':
  Fix 4560303: Add setting to lock later when power button pressed
 2012-01-10 10:29:59 -08:00
Jim Miller
071742d838 Fix 4560303: Add setting to lock later when power button pressed 
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
 2012-01-09 14:25:04 -08:00
Eric Fischer
cd6fc886ff am 2bccd7f4: Import revised translations. DO NOT MERGE 
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
  Import revised translations. DO NOT MERGE
 2011-12-13 10:52:31 -08:00
Eric Fischer
2bccd7f4a7 Import revised translations. DO NOT MERGE 
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
 2011-12-13 10:04:17 -08:00
Eric Fischer
74ddfbd658 am 080691ed: Import revised translations. DO NOT MERGE 
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:08:36 -08:00
Eric Fischer
080691eda9 Import revised translations. DO NOT MERGE 
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
 2011-12-12 11:00:08 -08:00
Meng Hu
1f2890f8f3 am 3feacdf3: Add Sprint update menu 
* commit '3feacdf3969800d6c53c6ca6f8ced2f8fc637f7f':
  Add Sprint update menu
 2011-12-08 14:17:27 -08:00
Meng Hu
3feacdf396 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
 2011-12-08 13:00:35 -08:00
Eric Fischer
4305c887ea am d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'd59d7cb0914ff4fb8e0a6cf6f33c2fd2a27b6559':
  Import revised translations. DO NOT MERGE
 2011-12-08 11:13:14 -08:00
Eric Fischer
d59d7cb091 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:58 -08:00
Eric Fischer
a5f26614c8 Import revised translations. DO NOT MERGE 
Change-Id: If9d9c2cd72682251e2743543c8f6ee36b2c2da2a
 2011-12-08 10:36:13 -08:00
Chia-chi Yeh
d16197b87c am 325c912a: Merge "VpnSettings: add support for server certificates." into ics-mr1 
* commit '325c912ae64e9559cf2e84d5c94d81a0e8a15c48':
  VpnSettings: add support for server certificates.
 2011-12-07 12:28:40 -08:00
Eric Fischer
57d31ef4df am 5166860e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '5166860e0af455d3a60498eb9eae25a0aa4b447e':
  Import revised translations.  DO NOT MERGE
 2011-12-07 11:02:11 -08:00
Eric Fischer
7f6dff02d1 am 5cee3120: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '5cee3120246b37ffd9ab6756c198d3398b3e6ba7':
  Import revised translations.  DO NOT MERGE
 2011-12-07 11:02:10 -08:00
Svetoslav Ganov
619ec917a4 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-07 09:27:55 -08:00
Chia-chi Yeh
f5317a151b VpnSettings: add support for server certificates. 
Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
 2011-12-06 17:51:01 -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
Eric Fischer
df387fe7f5 Import revised translations. DO NOT MERGE 
Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e
 2011-12-06 10:29:45 -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
Eric Fischer
7823baac40 Import revised translations. DO NOT MERGE 
Change-Id: I8d5ff4f5f728e3c00b63a81740b707d9ac14fb32
 2011-12-02 14:25:00 -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
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
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
Daniel Sandler
1e219778ed Pulling screen savers for now. DO NOT MERGE. 
Bug: 5689684
Change-Id: Ida6f23484c91d1cde539fc4a64e467970fa1fdb3
 2011-11-30 14:32:53 -05: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
21b5d18bcb Import revised translations. DO NOT MERGE 
Change-Id: Ia5368f1dffbd304e7b95d91f2a64acdc76381fa6
 2011-11-29 13:18:54 -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
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