PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,219 Commits 1 Branch 0 Tags
84ba32c91b91866bbab74eebe0097a90c4faac01
Commit Graph

5219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
48c7e2b920 am 22aca59e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '22aca59e80d2376b89262b598a486bdd3272d969':
  Import revised translations.  DO NOT MERGE
 2011-09-27 15:01:01 -07:00
Eric Fischer
22aca59e80 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-27 14:57:23 -07:00
Eric Fischer
145abb6e22 Import revised translations. DO NOT MERGE 
Change-Id: Ib4fe1d2dd91618933614f68f6224c8ac48d31bc8
 2011-09-27 14:33:22 -07:00
The Android Automerger
4607994003 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 13:32:47 -07:00
Amith Yamasani
125f4b8d67 am df5ab21d: am ae69755a: Disable USB connection type when monkeys are running. 
* commit 'df5ab21d21fac3107fed231d4469e5bc26a089f6':
  Disable USB connection type when monkeys are running.
 2011-09-27 13:12:55 -07:00
Amith Yamasani
df5ab21d21 am ae69755a: Disable USB connection type when monkeys are running. 
* commit 'ae69755aa874dbac77e9874d9716ab891a144193':
  Disable USB connection type when monkeys are running.
 2011-09-27 13:10:47 -07:00
Amith Yamasani
ae69755aa8 Disable USB connection type when monkeys are running. 
Bug: 5375336

Also use the correct API for testing if monkeys are running.
(ActivityManager.isUserAMonkey())

Bug: 5375910
Change-Id: I2bf8e061ee5977d521de197d3a92095c1a98218d
 2011-09-27 11:33:17 -07:00
Svetoslav Ganov
834a90f47a am 522b074b: Merge "Clarify install accessibility scripts wording." 
* commit '522b074bdae89737ee4ac8580a8c939f257f3f3a':
  Clarify install accessibility scripts wording.
 2011-09-27 11:23:36 -07:00
Svetoslav Ganov
522b074bda Merge "Clarify install accessibility scripts wording." 2011-09-27 11:22:06 -07:00
Svetoslav Ganov
af2a4547b9 Clarify install accessibility scripts wording. 
1. Updated the wording according to tech writer feedback to be
   more precise and avoid user confusion.

bug:5374051

Change-Id: Ica54b91f475be1d271f1588f044a5a2b72a44e51
 2011-09-27 11:13:02 -07:00
The Android Open Source Project
a60df34ea1 am c287e936: Reconcile with ics-factoryrom-release 
* commit 'c287e936dd5f0281059f46f0064ba8696c171e13':
 2011-09-27 10:16:39 -07:00
The Android Open Source Project
c287e936dd Reconcile with ics-factoryrom-release 
Change-Id: I412a835f2e84fb56191c0378cf5dc908935f7b8a
 2011-09-27 10:11:04 -07:00
Danielle Millett
5e83b2faeb am cc571cc4: Merge "Changed header to specify backup lock" 
* commit 'cc571cc4fe626517482435a8ffd3bd461bf4bbbd':
  Changed header to specify backup lock
 2011-09-27 07:27:24 -07:00
Danielle Millett
cc571cc4fe Merge "Changed header to specify backup lock" 2011-09-27 06:14:01 -07:00
satok
377706654b am e12b4cd5: Merge "Fix the alignment of the preference in IME settings on Tablet" 
* commit 'e12b4cd54da737f29f50a033bdf655a214722144':
  Fix the alignment of the preference in IME settings on Tablet
 2011-09-27 01:55:41 -07:00
satok
e12b4cd54d Merge "Fix the alignment of the preference in IME settings on Tablet" 2011-09-27 01:52:00 -07:00
satok
f5acea67b4 Fix the alignment of the preference in IME settings on Tablet 
Bug: 5366586

Change-Id: I2659415fb74cca2c65bdd3171217e786d4f41aac
 2011-09-27 17:47:51 +09:00
satok
01c2387bae am 44e32ab4: Merge "Tweak IME settings" 
* commit '44e32ab40fa1421a564801d2bfba0407575d7e37':
  Tweak IME settings
 2011-09-27 00:12:16 -07:00
satok
44e32ab40f Merge "Tweak IME settings" 2011-09-27 00:10:57 -07:00
satok
054fc44cae Tweak IME settings 
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
 2011-09-27 16:08:46 +09:00