PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,189 Commits 1 Branch 0 Tags
4c8ef82c27b450fbba3c6aa763ff0ac5eefe7b7c
Commit Graph

5189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
887d9d64f8 am 326f96c5: Update settings strings. 
* commit '326f96c5dca3ad59f9a96326e882eaa55cc7d560':
  Update settings strings.
 2011-10-03 08:40:34 -07:00
Jeff Hamilton
326f96c5dc Update settings strings. 
Bug: 5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015
 2011-10-03 10:38:14 -05:00
Bjorn Bringert
3e66bcfc4d am 4da63255: Merge "Fix ISO3 code for spanish in demo strings array." 
* commit '4da63255ed394b8cd2eb88c02a6c0b9235797866':
  Fix ISO3 code for spanish in demo strings array.
 2011-10-03 08:29:27 -07: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
a009c2a11a am c4fea5f9: Merge "Import revised translations." 
* commit 'c4fea5f9d2211ed8c48e7f901364df0e7dbbee26':
  Import revised translations.
 2011-09-30 16:59:15 -07: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
5a1d25f8bb am 31dac17c: Delete the temp gallery on return from fallback 
* commit '31dac17c4b0b49b4968b42b2af6f0799a0508a2f':
  Delete the temp gallery on return from fallback
 2011-09-30 13:10:03 -07: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
58ef35209a am c5df3daa: Merge "calling back SetupFaceLock to clean up temporary gallery" 
* commit 'c5df3daa0231c0b057497acc4527ead2fc979999':
  calling back SetupFaceLock to clean up temporary gallery
 2011-09-30 11:11:33 -07:00
Steven Ross
c5df3daa02 Merge "calling back SetupFaceLock to clean up temporary gallery" 2011-09-30 11:08:58 -07:00
Amith Yamasani
109c2ace97 am b40e4491: Merge "Remove "Screen lock" category header as the title is sufficient." 
* commit 'b40e4491efe99c1499d6af3a31a140ed99cf3560':
  Remove "Screen lock" category header as the title is sufficient.
 2011-09-29 16:44:39 -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
2623d685f3 am c00a9d9f: Merge "Add developer setting to force hardware acceleration" 
* commit 'c00a9d9f5e0719601f670207f57d50225365f2cb':
  Add developer setting to force hardware acceleration
 2011-09-29 16:43:01 -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
eeb54c2e2b am 70e330a6: Reconcile with ics-factoryrom-release 
* commit '70e330a627128ab8b3bf67b1543ecf715f4a7724':
 2011-09-29 14:26:53 -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
4528867997 am 8fc853b1: Merge "Set longer char limit for sync setting strings" 
* commit '8fc853b19a369f56f20c4dfa109e618af7796eff':
  Set longer char limit for sync setting strings
 2011-09-29 12:23:13 -07:00
Daisuke Miyakawa
8fc853b19a Merge "Set longer char limit for sync setting strings" 2011-09-29 12:20:34 -07:00
Gilles Debunne
aa05d60cae am 62061e14: Merge "Bug 5353255: use a switch to toggle accounts & sync" 
* commit '62061e14fb7eced16e43d879518ec72b696197ab':
  Bug 5353255: use a switch to toggle accounts & sync
 2011-09-29 10:23:45 -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
92e2a9a296 am 0b174b38: Fix the text color. 
* commit '0b174b388306038efe4e95906084c15e9c8e8f29':
  Fix the text color.
 2011-09-28 12:57:33 -07:00
Jeff Hamilton
0b174b3883 Fix the text color. 
Bug: 5375784
Change-Id: I5307636b607f3e3a5e4afb34ece6f84320dc9cca
 2011-09-28 14:54:57 -05:00
Jeff Hamilton
1acdc17067 am 852f3cb7: Merge "Fix the text size." 
* commit '852f3cb7601de604ee9ce57d1ecede1bec36e74a':
  Fix the text size.
 2011-09-28 12:45:44 -07: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
87c176bdd4 am 8fe98699: Fix the behavior of preference in IME Settings 
* commit '8fe9869955f4c85ccc2f3cb11dfbfdb253318ea1':
  Fix the behavior of preference in IME Settings
 2011-09-27 20:36:28 -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
8476fc08d5 am 0554ddb3: Merge "Show in Settings->About if the device is an engineering sample." 
* commit '0554ddb39a5bdbbcf88bdf31094b37ead5d95032':
  Show in Settings->About if the device is an engineering sample.
 2011-09-27 19:32:41 -07:00
Mike Sipe
8dc669d037 am ce73fc83: Merge "Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings" 
* commit 'ce73fc83e7a208a1149aec3085b6e9b55efc8e52':
  Fix 5287113: rename "FaceLock" to "Face Unlock" in Settings
 2011-09-27 19:32:33 -07:00
Jeff Sharkey
1094795864 am 1ef9c541: am 76ac6a9b: Merge "About." into ics-factoryrom 
* commit '1ef9c5416df9c72a543dbed454b4c282ec6f1fed':
  About.
 2011-09-27 19:32:17 -07:00
Eric Fischer
7868c8eaec am 48c7e2b9: (-s ours) am 22aca59e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '48c7e2b920e0bfe86ad32483128403d1c37b5ca4':
  Import revised translations.  DO NOT MERGE
 2011-09-27 19:19:53 -07:00
Amith Yamasani
0554ddb39a Merge "Show in Settings->About if the device is an engineering sample." 2011-09-27 18:13:25 -07:00
Amith Yamasani
2397a7391e Show in Settings->About if the device is an engineering sample. 
Don't show anything additional for a production device.

Bug: 5380778
Change-Id: I82532c37b0fc71fe5ada91a7b945b3becffbc535
 2011-09-27 18:06:33 -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
Jeff Sharkey
1ef9c5416d am 76ac6a9b: Merge "About." into ics-factoryrom 
* commit '76ac6a9bcb7cfc3be79e956a6207599e6910de8a':
  About.
 2011-09-27 16:27:56 -07:00
Jeff Sharkey
76ac6a9bcb Merge "About." into ics-factoryrom 2011-09-27 16:26:08 -07:00
Jeff Sharkey
246120e5ff About. 
Bug: 5337015
Change-Id: I41f302a6f329c54c9d6abb8925c228fee5cc716f
 2011-09-27 15:13:10 -07:00