Danielle Millett
c7a15ec8e8
Merge "Update string to match wireframe"
2011-10-05 19:04:05 -07:00
Danielle Millett
76d9af0a87
Update string to match wireframe
...
Change-Id: If406ab1364451e28352d120b473a7a58a124bff4
2011-10-05 21:49:03 -04:00
Jeff Brown
cbf312ec29
Use WM APIs to change rotation preference.
...
Bug: 5371750
Changing the system setting directly results in inconsistent
behavior among the three different places where "auto-rotate"
settings appear in the UI. Use the WM APIs instead.
Change-Id: I1a8239af66b1cc3aeec8310383e72fc96c878d73
2011-10-05 16:12:27 -07:00
Narayan Kamath
3f28ff1a06
Merge "Don't hide TTS settings if no recognizer is found."
2011-10-05 05:11:09 -07:00
Narayan Kamath
e247cb8299
Don't hide TTS settings if no recognizer is found.
...
bug:5412210
Change-Id: I6fdfda7f5f7bcd22acda2fd2b55e0d76f0fab1cd
2011-10-05 13:03:41 +01: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
Danielle Millett
b965e1ccd7
Merge "Showing tutorial for Face Unlock on first try"
2011-10-04 18:45:03 -07:00
Danielle Millett
c82ba86375
Showing tutorial for Face Unlock on first try
...
Change-Id: Idf072750e70a9e5bc7699675d8a7a9c57900eea3
2011-10-04 21:00:07 -04:00
Amith Yamasani
040ad494c5
Merge "Handle unexpected null cursor and don't forget to close it."
2011-10-04 15:28:06 -07: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
Amith Yamasani
c86755bfd5
Handle unexpected null cursor and don't forget to close it.
...
Bug: 5406071
Change-Id: Ia40cf7e5a3e32d6f364e787ee66580c685507571
2011-10-04 15:00:21 -07:00
Amith Yamasani
fbcad75a84
Merge "Introduce half-brightness icon in Power Control widget."
2011-10-04 14:03:47 -07:00
Adam Powell
155c427e0b
Merge "Bug 5126088 - update layout for activate device policy activity"
2011-10-04 13:53:06 -07:00
Adam Powell
a70e1468cf
Bug 5126088 - update layout for activate device policy activity
...
Change-Id: Ifd5963adc0dc30c0a650bac822dbbd7cb938c144
2011-10-04 13:48:50 -07:00
Steven Ross
2d53e1a5d2
Merge "Formatting fix"
2011-10-04 13:03:38 -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
Dianne Hackborn
e6abedd6b8
Merge "Account for all wake lock usage."
2011-10-04 11:51:54 -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
Steven Ross
4838c59f88
Merge "Excluding ChooseLockGeneric from recents"
2011-10-04 03:15:16 -07:00
Dianne Hackborn
c174ec64f9
Account for all wake lock usage.
...
Wake locks can be held outside of what we measure in battery stats,
by things not going through the power manager. Account for this by
computing the total wake time that is not covered by known wake locks
and screen on time, and blame this on Android OS.
Change-Id: Idf2907bc35f8c35f92155671c8dba521ae9ea804
2011-10-03 18:37:44 -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
Danielle Millett
dd98ff192c
Merge "Reorganized the biometric weak check functions"
2011-10-03 17:38:41 -07:00
Amith Yamasani
a9125d4d59
Introduce half-brightness icon in Power Control widget.
...
Bug: 5358696
Change-Id: Iae484e786f4dd7a5e88078b69053f01425b79aef
2011-10-03 15:22:04 -07:00
Jeff Hamilton
326f96c5dc
Update settings strings.
...
Bug: 5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015
2011-10-03 10:38:14 -05:00
Bjorn Bringert
4da63255ed
Merge "Fix ISO3 code for spanish in demo strings array."
2011-10-03 08:22:21 -07:00
Steven Ross
b7a9e9522c
Excluding ChooseLockGeneric from recents
...
This excludes ChooseLockGeneric from the list of recent activities,
so that the backup lock doesn't show up there.
This should only impact ChooseLockGeneric.
Change-Id: If9b9d7b7287191cec1a7f41221b1f0451593a5e8
2011-10-03 10:06:44 -04: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
Steven Ross
7caac4c19d
Formatting fix
...
Change-Id: If2869f2d6d6bc788cfffc1187b4de1deb9cec83b
2011-10-03 06:50:47 -04:00
Eric Fischer
c4fea5f9d2
Merge "Import revised translations."
2011-09-30 16:56:22 -07:00
Eric Fischer
9f12b39cf5
Import revised translations.
...
Change-Id: I8b8b4ce15c2a6a55c89fe3ca987db8e34526782b
2011-09-30 16:46:13 -07:00
Danielle Millett
0fb158a685
Reorganized the biometric weak check functions
...
Moved isBiometricSensorAvailable functionality into
isBiometricWeakInstalled (formerly called isBiometricEnabled). Settings
now only shows biometric weak if it's installed, if it's not installed
and the lock type is currently set to biometric weak, the backup lock
is shown as being set instead.
Change-Id: Icfe326a6598df33ee60d5fdc024273d94f115983
2011-09-30 17:47:45 -04:00
Steven Ross
31dac17c4b
Delete the temp gallery on return from fallback
...
Change-Id: Id501302aa8c5606006f3e403e51bb01981bc173e
2011-09-30 15:51:57 -04:00
Steven Ross
c5df3daa02
Merge "calling back SetupFaceLock to clean up temporary gallery"
2011-09-30 11:08:58 -07:00
Amith Yamasani
b40e4491ef
Merge "Remove "Screen lock" category header as the title is sufficient."
2011-09-29 16:43:34 -07:00
Romain Guy
c00a9d9f5e
Merge "Add developer setting to force hardware acceleration"
2011-09-29 16:39:59 -07:00
Romain Guy
0c9c14b786
Add developer setting to force hardware acceleration
...
Change-Id: I1bb3da7db4602ce7cbdfb46799c5114ce63ffed2
2011-09-29 16:39:31 -07:00
Amith Yamasani
cf26bb2dcc
Remove "Screen lock" category header as the title is sufficient.
...
Bug: 5203189
Insert a descriptive text as a header view when in weak biometric
fallback case.
Change-Id: Ic10cc7d276975b13c188bd15016fea2200ec0e5b
2011-09-29 15:19:07 -07:00
The Android Open Source Project
70e330a627
Reconcile with ics-factoryrom-release
...
Change-Id: Ic9b67f23461c79494602a31e6a671300b7943ee9
2011-09-29 14:25:20 -07:00
Steven Ross
c620ba41ce
calling back SetupFaceLock to clean up temporary gallery
...
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
The temporary gallery is always deleted
Also deletes the main gallery if the lock type is changed from facial recognition
Change-Id: Id7b066fd852c7ba188d6e46b47391a362cbab40f
2011-09-29 16:01:13 -04:00
Daisuke Miyakawa
8fc853b19a
Merge "Set longer char limit for sync setting strings"
2011-09-29 12:20:34 -07:00
Gilles Debunne
62061e14fb
Merge "Bug 5353255: use a switch to toggle accounts & sync"
2011-09-29 10:21:08 -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
Gilles Debunne
13b7d8aa45
Bug 5353255: use a switch to toggle accounts & sync
...
Change-Id: I00821ba63651d713a148021f64bb95e7f69e6b88
2011-09-28 15:15:30 -07:00
Jeff Hamilton
0b174b3883
Fix the text color.
...
Bug: 5375784
Change-Id: I5307636b607f3e3a5e4afb34ece6f84320dc9cca
2011-09-28 14:54:57 -05:00
Jeff Hamilton
852f3cb760
Merge "Fix the text size."
2011-09-28 12:43:18 -07:00
Jeff Hamilton
9b0631ca5b
Fix the text size.
...
Bug: 5375784
Change-Id: I458be9e4a025c439088df22195301d48e94e1b90
2011-09-28 14:21:07 -05:00
The Android Automerger
491f524d06
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-28 06:10:26 -07:00
satok
8fe9869955
Fix the behavior of preference in IME Settings
...
Change-Id: I41f7c36fb73730248dcc98abbf4276ef6d772f36
2011-09-28 12:01:40 +09:00
Amith Yamasani
0554ddb39a
Merge "Show in Settings->About if the device is an engineering sample."
2011-09-27 18:13:25 -07:00