Commit Graph

975 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Amith Yamasani
1af528b1ab am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1
* commit '2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
  Remove system tutorial option in Settings->About.
2011-11-09 18:59:13 +00:00
Amith Yamasani
2ad06bbd5f Merge "Remove system tutorial option in Settings->About." into ics-mr1 2011-11-08 17:30:23 -08:00
Amith Yamasani
75a51aa6d2 Remove system tutorial option in Settings->About.
It was being activated by third party IMEs that have tutorials. Remove
the code permanently, since we don't support the system tutorial flow
anymore.

Bug: 5425836
Change-Id: I691b8d48309b3dd3a25c9994334dc4692a70e482
2011-11-08 11:08:28 -08:00
Danielle Millett
498116df1d am 179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1
* commit '179b32869c4476a30b0c933fb73a1a8e258ce11c':
  Adding an improve face matching settings option for Face Unlock
2011-11-08 18:28:19 +00:00
Jason Simmons
f75335564e resolved conflicts for merge of 322da591 to ics-aah
Change-Id: I4cd3301cf448761b2585c16f83787f6f2c9007b9
2011-11-08 10:23:15 -08:00
Danielle Millett
179b32869c Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 2011-11-08 10:03:17 -08:00
tk.mun
7c5c16565e Wimax : 4G settings menu and 4G MAC address.
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
2011-11-07 17:16:18 -08:00
Danielle Millett
487b16f340 Adding an improve face matching settings option for Face Unlock
Adding an option which will launch a version of setup where faces
can be added to the current gallery.  It requires the user to first
confirm their password before launching addToSetup.

Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.

Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.

Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
2011-11-07 17:29:22 -05:00
Mike J. Chen
ef4eb89d71 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: I23c2d1483a4d71b0025624c2e4aaacc688de3260
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-10-27 17:39:54 -04:00
John Huang
f9389c7ef0 am 7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit '7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
  Add "Roaming protocol" to APN editor.
2011-10-17 15:22:28 -07:00
John Huang
7b21e97c2a Merge "Add "Roaming protocol" to APN editor." into ics-mr0 2011-10-17 15:20:28 -07:00
Claudia de Veaux
1aa9c67783 Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs: 5467607, 5163232" 2011-10-17 14:20:29 -07:00
Claudia de Veaux
7dc36b90ce Restore Wi-Fi spelling; change "extra-large" to "huge".
Bugs: 5467607, 5163232

Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22
2011-10-17 12:54:20 -07:00
Eric Fischer
e5bfb640fb Fix capitalization of Face Unlock.
Bug 5447766

Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
2011-10-17 11:28:34 -07:00
John Huang
d0de427f9a Add "Roaming protocol" to APN editor.
Field already exists in the APN database.  Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes).  Will revisit enabling
for all in a future release.

Bug: 5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284
2011-10-16 14:35:00 -07:00
Jeff Sharkey
e4599058dd Toast when finished pattern or password setup.
Bug: 5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623
2011-10-13 11:33:43 -07:00
Romain Guy
3d32d00edd Fix string for hdpi devices
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
2011-10-06 14:37:34 -07:00
Jeff Sharkey
051cda2e46 Merge "Third time is the charm." 2011-10-05 22:57:19 -07:00
Jeff Sharkey
3a546ebacb Third time is the charm.
Change-Id: Ic58a7f80e3be0c5d1a0531727f0abac0c8f96fba
2011-10-05 22:54:52 -07:00
Jeff Sharkey
3a5a82c756 Merge "Fix string breakage." 2011-10-05 22:14:24 -07:00
Jeff Sharkey
82bf63496b Fix string breakage.
Change-Id: Ib81c1bfd9ef49f7e410887ab5c22e3e3cc31ca22
2011-10-05 22:13:02 -07:00
Jeff Sharkey
0c927302d7 Merge "Adjust data usage strings." 2011-10-05 21:59:42 -07:00
Danielle Millett
76d9af0a87 Update string to match wireframe
Change-Id: If406ab1364451e28352d120b473a7a58a124bff4
2011-10-05 21:49:03 -04:00
Jeff Sharkey
d86e9b207a Adjust data usage strings.
Bug: 5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403
2011-10-05 17:44:12 -07:00
satok
a43dd3962e Show a security warning dialog when switching a spell checker
Bug: 5402295

Change-Id: I021e6e923fa137248d23c8fa39e68afdf73fead9
2011-10-05 19:11:28 +09:00
Eric Fischer
dfb894c136 Fix mismatched markup in Settings strings.
Revert "Revert "Settings strings cleanup per standards.""

Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design.
Will file separate bug to have the titles removed properly;
for now I just made the string empty.

This reverts commit e2db5875f6.

Change-Id: I0f865d1441d990e5e63f2a257a27ae521220af14
2011-10-04 15:07:16 -07:00
Claudia de Veaux
bbb7097a68 Merge "Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"" 2011-10-04 12:52:16 -07:00
Claudia de Veaux
e2db5875f6 Revert "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
This reverts commit c9c29d90f7
2011-10-04 12:51:23 -07:00
Claudia de Veaux
2e0143b415 Merge "Settings strings cleanup per standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty." 2011-10-04 11:30:03 -07:00
Claudia de Veaux
c9c29d90f7 Settings strings cleanup per standards.
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328
Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design. Will
file separate bug to have the titles removed properly; for now I
just made the string empty.

Change-Id: I56b251a0d639f8d25f0908c636226e0d6e7da6a5

More changes to add <xliff:g/> around raw HTML per Eric Fischer.

Fixed redundant <string> tag caught in review.
2011-10-03 18:07:06 -07:00
Jeff Hamilton
326f96c5dc Update settings strings.
Bug: 5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015
2011-10-03 10:38:14 -05:00
Narayan Kamath
59ab1ec3e7 Fix ISO3 code for spanish in demo strings array.
bug:5399728
Change-Id: Ib001425c0ea0298720d9c65f5ece22ecd70ce471
2011-10-03 14:46:44 +01:00
Romain Guy
0c9c14b786 Add developer setting to force hardware acceleration
Change-Id: I1bb3da7db4602ce7cbdfb46799c5114ce63ffed2
2011-09-29 16:39:31 -07:00
Daisuke Miyakawa
558b23a2d3 Set longer char limit for sync setting strings
Translated strings cannot be accomodated while we can have
longer ones there.

Bug: 5376058
Change-Id: I83ec28964c3aa19cb16fa8fc648ef392e67d4f49
2011-09-28 18:52:19 -07:00
Mike Sipe
ce73fc83e7 Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings" 2011-09-27 17:01:12 -07:00
Jim Miller
a277b56425 Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings
Change-Id: If42c7c12e5084f5c18d0959a1c1a0c538aed8ac0
2011-09-27 16:39:20 -07:00