PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,578 Commits 1 Branch 0 Tags
841f2d2e177788ad8b9d15d77bb3bb9d64038bc4
Commit Graph

7578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
9512935e21 am 96e2a62a: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '96e2a62a464c1c1d9866c6ab515ed2f78ab11a62':
  Import translations. DO NOT MERGE
 2012-05-31 15:52:02 -07:00
Eric Fischer
10cdaf9e87 Merge "Import translations. DO NOT MERGE" 2012-05-31 15:48:42 -07:00
Eric Fischer
96e2a62a46 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-31 15:48:12 -07:00
Amith Yamasani
68f03e9ede am 31d868b3: am 040029af: Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev 
* commit '31d868b37c5c48b469fdf890d8021887461c2f36':
  Reword the summary text for Unknown sources in Security Settings
 2012-05-31 15:33:45 -07:00
Amith Yamasani
31d868b37c am 040029af: Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev 
* commit '040029af27276317a009440ec93872e134c98216':
  Reword the summary text for Unknown sources in Security Settings
 2012-05-31 15:31:11 -07:00
Amith Yamasani
040029af27 Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev 2012-05-31 15:27:19 -07:00
Irfan Sheriff
5afc87c6ba am 078f1325: am c26c2f22: Merge "Fetch peers after preferenceScreen is ready" into jb-dev 
* commit '078f1325aa10de073112bdc38a2d78267318b5eb':
  Fetch peers after preferenceScreen is ready
 2012-05-31 15:11:25 -07:00
Irfan Sheriff
078f1325aa am c26c2f22: Merge "Fetch peers after preferenceScreen is ready" into jb-dev 
* commit 'c26c2f22042b676539f664002ec51ce78d276b62':
  Fetch peers after preferenceScreen is ready
 2012-05-31 15:08:44 -07:00
Irfan Sheriff
c26c2f2204 Merge "Fetch peers after preferenceScreen is ready" into jb-dev 2012-05-31 15:04:53 -07:00
Björn Lundén
e7c53b1c9e Settings: Use ICS alert drawable 
Point to the correct holo alert drawable.

Change-Id: Ia15aaa028c8371cb2478baeecd2da31520c43a5d
 2012-05-31 23:35:24 +02:00
Eric Fischer
0cd2d04f2d Import translations. DO NOT MERGE 
Change-Id: I2b3d8deb06e253d4b1149abe371d7e4144b781d2
 2012-05-31 14:29:54 -07:00
Eric Fischer
b9b70aa734 Import translations. DO NOT MERGE 
Change-Id: I508ef274b0aa63d2505a2db40534697b6b266666
 2012-05-31 14:28:01 -07:00
Amith Yamasani
8f98771c5c Reword the summary text for Unknown sources in Security Settings 
Don't use "non-Market" to describe unknown sources.

Bug: 6586626
Change-Id: I2ab440e9db1592ea8b398bd9466ff2f05ca5f6ce
 2012-05-31 13:12:13 -07:00
Irfan Sheriff
a9d76b3bcc Fetch peers after preferenceScreen is ready 
Bug: 6450152
Change-Id: Ic95c7fdba5fa7cb54b0c54ed9a423e0e0683ad2f
 2012-05-31 12:44:03 -07:00
Irfan Sheriff
f05811949f am 945a36f6: am 5388bc88: Merge "Fix poor network detection setting" into jb-dev 
* commit '945a36f621a5406b20602dd4080fcd59f8a9950f':
  Fix poor network detection setting
 2012-05-31 12:27:02 -07:00
Irfan Sheriff
945a36f621 am 5388bc88: Merge "Fix poor network detection setting" into jb-dev 
* commit '5388bc88bdf045a461c52856e9bc2de9f1664acf':
  Fix poor network detection setting
 2012-05-31 12:25:04 -07:00
Irfan Sheriff
5388bc88bd Merge "Fix poor network detection setting" into jb-dev 2012-05-31 12:22:30 -07:00
Irfan Sheriff
f0780a7cad Fix poor network detection setting 
We used to base this on watchdog being turned on, but it should
be based on whether device is wifi only

Bug: 6576101
Change-Id: Ib5221287e6713c625d39ef986ceb278825fb4895
 2012-05-31 11:15:41 -07:00
Uriel Rodriguez
4ccff69e52 am 3ddef8a7: (-s ours) am c9bd848b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev 
* commit '3ddef8a7f208aa3d2ed889568b3bcb4673dbcdbf':
  BUG 5457035 : Anti-spoofing : DO NOT MERGE
 2012-05-31 08:49:36 -07:00
Uriel Rodriguez
3ddef8a7f2 am c9bd848b: Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev 
* commit 'c9bd848b11c126642ec20c67cc03908f1f445bec':
  BUG 5457035 : Anti-spoofing : DO NOT MERGE
 2012-05-31 08:46:45 -07:00
Uriel Rodriguez
c9bd848b11 Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev 2012-05-31 08:44:09 -07:00
satok
f79571a202 am 04b85275: am 15065213: Do not show security warning for the system IMEs 
* commit '04b85275707b5171cd45ce4d7ba1a5cfac084ea8':
  Do not show security warning for the system IMEs
 2012-05-31 08:05:53 -07:00
satok
04b8527570 am 15065213: Do not show security warning for the system IMEs 
* commit '15065213620da656c210f356c1111e7382f5be73':
  Do not show security warning for the system IMEs
 2012-05-31 08:03:48 -07:00
satok
1506521362 Do not show security warning for the system IMEs 
Bug: 6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399
 2012-05-31 23:43:37 +09:00
The Android Automerger
0652ff0ce3 merge in jb-release history after reset to jb-dev 2012-05-31 07:05:00 -07:00
Uriel Rodriguez
5c489be89c BUG 5457035 : Anti-spoofing : DO NOT MERGE 
Squashed commit of the following:

commit 060b9daf5fe3c45573a13a149bf98f4fa1e6a46f
Author: Danielle Millett <dmillett@google.com>
Date:   Wed May 30 15:50:03 2012 -0400

    Added head turn option for Face Unlock.

    In security settings there is an option for head turn and it shows the current
    status (on/off).  Clicking on this goes to another screen that describes the
    feature and allows the user to it on/off.
    Since the head turn option goes to a different screen instead of using a check box,
    this change also rips out the rest of the code for the old liveliness checkbox.

    Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e

Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
 2012-05-30 19:55:12 -04:00
Jeff Brown
1bfcc398f5 am 6e0902b4: am caaa850f: Merge "Fix comparison of device source bits." into jb-dev 
* commit '6e0902b43e86e7a25fdea1ae1b979ca091fc1a17':
  Fix comparison of device source bits.
 2012-05-30 15:12:20 -07:00
Jeff Brown
6e0902b43e am caaa850f: Merge "Fix comparison of device source bits." into jb-dev 
* commit 'caaa850ffb143edd827cf2a9b9e49b37e9aa777d':
  Fix comparison of device source bits.
 2012-05-30 15:07:05 -07:00
Jeff Brown
caaa850ffb Merge "Fix comparison of device source bits." into jb-dev 2012-05-30 15:00:50 -07:00
Jeff Brown
bf677f48b7 Fix comparison of device source bits. 
Bug: 6576743
Change-Id: I123307defc32a84a965590fbded95c6997260675
 2012-05-30 14:33:16 -07:00
Danielle Millett
4bca9d17f7 Merge "Added head turn option for Face Unlock." 2012-05-30 14:07:31 -07:00
Eric Fischer
e92a9c4314 am 62dd9132: (-s ours) am a2d55407: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '62dd9132f13cbd0d78228268c45b310414ec7d0c':
  Import translations. DO NOT MERGE
 2012-05-30 13:57:00 -07:00
Danielle Millett
d35705f1dd Added head turn option for Face Unlock. 
In security settings there is an option for head turn and it shows the current
status (on/off).  Clicking on this goes to another screen that describes the
feature and allows the user to it on/off.
Since the head turn option goes to a different screen instead of using a check box,
this change also rips out the rest of the code for the old liveliness checkbox.

Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e
 2012-05-30 16:56:23 -04:00
Eric Fischer
62dd9132f1 am a2d55407: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'a2d55407317b50f86069f9e9feb6a0478ee3b1f9':
  Import translations. DO NOT MERGE
 2012-05-30 13:54:39 -07:00
Eric Fischer
5e93753a9b Merge "Import translations. DO NOT MERGE" 2012-05-30 13:50:30 -07:00
Eric Fischer
a2d5540731 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-30 13:50:22 -07:00
Eric Fischer
0e3e487386 Import translations. DO NOT MERGE 
Change-Id: I578587dcb77558da9529bf6a409c849492508f9b
 2012-05-30 13:38:53 -07:00
Eric Fischer
1b2e4b8e14 Import translations. DO NOT MERGE 
Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
 2012-05-30 13:37:01 -07:00
The Android Open Source Project
3f9ab1be66 am e34d0df2: Reconcile with jb-release 
* commit 'e34d0df2b45258fafa0faa76dd55b658a777c637':
  Surface metered networks as "Mobile hotspots."
 2012-05-30 10:22:00 -07:00
The Android Open Source Project
e34d0df2b4 Reconcile with jb-release 
Change-Id: Ia54294c438373cc24703fc93bbd95f4b936d668a
 2012-05-30 10:16:25 -07:00
Amith Yamasani
622824ad00 am 6eddf3eb: am 8242901e: Merge "Adjust layout to avoid clipping." into jb-dev 
* commit '6eddf3eb1ab28d252d49022774fc7e9fcde5f252':
  Adjust layout to avoid clipping.
 2012-05-30 10:00:18 -07:00
Amith Yamasani
6eddf3eb1a am 8242901e: Merge "Adjust layout to avoid clipping." into jb-dev 
* commit '8242901e1682826137208bfe2fe35c8f50fa0be8':
  Adjust layout to avoid clipping.
 2012-05-30 09:57:47 -07:00
Amith Yamasani
8242901e16 Merge "Adjust layout to avoid clipping." into jb-dev 2012-05-30 09:55:45 -07:00
The Android Automerger
fde20280cc merge in jb-release history after reset to jb-dev 2012-05-30 07:05:36 -07:00
Svetoslav Ganov
ed312aa199 am d3c16b49: am a99d1125: Merge "Lock screen rotation accessibility preference not updated." into jb-dev 
* commit 'd3c16b49fb08608af6431379513d6605eab32718':
  Lock screen rotation accessibility preference not updated.
 2012-05-29 20:06:30 -07:00
Svetoslav Ganov
d3c16b49fb am a99d1125: Merge "Lock screen rotation accessibility preference not updated." into jb-dev 
* commit 'a99d1125e2ede99391e8cff6c4bee179fdc81d06':
  Lock screen rotation accessibility preference not updated.
 2012-05-29 20:04:43 -07:00
Svetoslav Ganov
a99d1125e2 Merge "Lock screen rotation accessibility preference not updated." into jb-dev 2012-05-29 20:02:50 -07:00
Dianne Hackborn
81b15b792a am a9dab4ff: am 10be9eaa: Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev 
* commit 'a9dab4ff30d08eec08581b93abba997fbd994b84':
  Fix issue where Manage Apps would not start on correct page.
 2012-05-29 19:16:33 -07:00
Dianne Hackborn
a9dab4ff30 am 10be9eaa: Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev 
* commit '10be9eaa812b38d4ad5d40afaeb05dfdf7d448b1':
  Fix issue where Manage Apps would not start on correct page.
 2012-05-29 19:13:56 -07:00
Dianne Hackborn
10be9eaa81 Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev 2012-05-29 19:09:45 -07:00