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

7603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
92c40a213b am 7a5a3b9c: am 66a55562: Merge "Make string bigger for localization." into jb-dev 
* commit '7a5a3b9c4e397383b192bd9a61b904f53e93381e':
  Make string bigger for localization.
 2012-05-29 18:14:05 -07:00
Jeff Brown
7a5a3b9c4e am 66a55562: Merge "Make string bigger for localization." into jb-dev 
* commit '66a55562c7848d7616196238605e7970d231d22b':
  Make string bigger for localization.
 2012-05-29 18:10:20 -07:00
Jeff Brown
66a55562c7 Merge "Make string bigger for localization." into jb-dev 2012-05-29 18:05:35 -07:00
Svetoslav Ganov
3aa58b0f35 Lock screen rotation accessibility preference not updated. 
1. If the lock screen rotation preference is changed from the
   status bar the checkbox in the accessibility settings was
   not updated.

bug:6562028

Change-Id: I353e3ad59374ad207297d2a6682e50ed07df820c
 2012-05-29 17:36:51 -07:00
Jeff Brown
693d7b7449 Make string bigger for localization. 
Bug: 6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
 2012-05-29 17:26:27 -07:00
Dianne Hackborn
13ba7e6556 Fix issue where Manage Apps would not start on correct page. 
We weren't setting the correct initial page in the view
pager.

Change-Id: I68846505a4f23547e9b09e4bc06e3d455ae9556f
 2012-05-29 17:21:05 -07:00
Jeff Sharkey
02939d4fd8 Surface metered networks as "Mobile hotspots." 
String changes to give clearer definition of metered networks, and
remove metered control for mobile network.  Also fix NPE when testing
hasEthernet() before session is ready.

Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
 2012-05-29 15:50:32 -07:00
Amith Yamasani
77859dfa79 Adjust layout to avoid clipping. 
Fixes the WiFi AP dialogs getting clipped at the right edge.

Bug: 6525128
Change-Id: Ic1c5c682d51e1492fe3c739c01255db886a90518
 2012-05-29 15:49:29 -07:00
Jeff Sharkey
3e87ee0261 am 27143c0b: am 16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev 
* commit '27143c0b54638f29dd0aa0095ff2505e3adac827':
  Surface metered networks as "Mobile hotspots."
 2012-05-29 15:04:52 -07:00
Jeff Sharkey
27143c0b54 am 16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev 
* commit '16bf0e0ec7dbd606ea5a5c8a1a9653f1cbb6d9b6':
  Surface metered networks as "Mobile hotspots."
 2012-05-29 15:03:13 -07:00
Jeff Sharkey
16bf0e0ec7 Merge "Surface metered networks as "Mobile hotspots."" into jb-dev 2012-05-29 15:01:33 -07:00
Eric Fischer
1873c333c5 am ad23b800: (-s ours) am 6de0ec64: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'ad23b800e1d23ac6fd61ad82acb35de5f224aca2':
  Import translations. DO NOT MERGE
 2012-05-29 14:40:36 -07:00
Eric Fischer
ad23b800e1 am 6de0ec64: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '6de0ec640d4ddd618b7f9fa7c9fc131d13979b97':
  Import translations. DO NOT MERGE
 2012-05-29 14:37:07 -07:00
Eric Fischer
6de0ec640d Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-29 14:34:03 -07:00
Amith Yamasani
96449c400e am baf9b5fb: am 35ff41b5: Merge "Retain text in Rename Device dialog." into jb-dev 
* commit 'baf9b5fb05f046d3dea8f6c9b7334867a0c57fd8':
  Retain text in Rename Device dialog.
 2012-05-29 14:18:46 -07:00
Amith Yamasani
baf9b5fb05 am 35ff41b5: Merge "Retain text in Rename Device dialog." into jb-dev 
* commit '35ff41b5f7928acaa5112051f519e3333106d239':
  Retain text in Rename Device dialog.
 2012-05-29 14:16:15 -07:00
Eric Fischer
00d60cf723 Import translations. DO NOT MERGE 
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
 2012-05-29 14:15:59 -07:00
Amith Yamasani
35ff41b5f7 Merge "Retain text in Rename Device dialog." into jb-dev 2012-05-29 14:13:50 -07:00
Amith Yamasani
5864701197 Retain text in Rename Device dialog. 
Also, show the current device name in the dialog, if available.

Bug: 6508967
Change-Id: I34d420e197796352aeab74121bdee55c2d2854d7
 2012-05-29 13:19:26 -07:00
Jeff Sharkey
d878909980 Surface metered networks as "Mobile hotspots." 
String changes to give clearer definition of metered networks, and
remove metered control for mobile network.  Also fix NPE when testing
hasEthernet() before session is ready.

Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
 2012-05-29 11:03:55 -07:00
The Android Open Source Project
74dae9e63e am a1801694: Reconcile with jb-release nakasi-factoryrom-release 
* commit 'a18016940f7eeeaab032d8a089aafec0278ef45e':
 2012-05-29 09:44:57 -07:00
The Android Open Source Project
a18016940f Reconcile with jb-release nakasi-factoryrom-release 
Change-Id: I96cdf547dadf2a15abbb73874390620639dae0c6
 2012-05-29 09:41:21 -07:00
The Android Automerger
b5e989cb40 merge in jb-release history after reset to jb-dev 2012-05-29 09:00:37 -07:00
Marcus Bauer
5b332e86ba Settings: Fixed German translation for turning WLAN/Bluetooth on 
Prior to this patch, the question "WLAN aktivieren?" would show
after you turned it on, and while it is loading; this patch
merely addresses this issue and changes it to "WLAN wird aktiviert",
which is consistent with the message showing up when turning it off.

Likewise for turning Bluetooth on.

Change-Id: Ic91143836a85751c39839daae720ac03b174bfde
 2012-05-27 10:58:31 +02:00
Eric Fischer
a91bf85e11 Merge "Import translations. DO NOT MERGE" 2012-05-25 16:46:19 -07:00