Eric Fischer
8e58449072
am 6f10eb7d
: Import translations. DO NOT MERGE
...
* commit '6f10eb7db50514bd5530a633ea1ebed571c84582':
Import translations. DO NOT MERGE
2012-06-05 12:13:40 -07:00
Eric Fischer
6f10eb7db5
Import translations. DO NOT MERGE
...
Change-Id: I81581e50f658f628a5d6354c9c8372cc1a98d566
2012-06-05 12:03:44 -07:00
Eric Fischer
5f366fd3aa
am 90504516
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '9050451649b920a490117462ec71e87a0aa3ee63':
Import translations. DO NOT MERGE
2012-06-04 18:25:39 -07:00
Eric Fischer
9050451649
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-04 18:21:44 -07:00
Eric Fischer
99929802f5
Import translations. DO NOT MERGE
...
Change-Id: I3347ec085b2a09f654b17c0609522d47a14627b2
2012-06-04 18:19:13 -07:00
Amith Yamasani
227edcf61a
am 03295520
: Merge "Account types at toplevel of Settings" into jb-dev
...
* commit '03295520359e06013d77387979a182845a2b1f1b':
Account types at toplevel of Settings
2012-06-04 18:05:35 -07:00
Amith Yamasani
d1ab82807a
Account types at toplevel of Settings
...
Reorganized Account settings to show account types at the top-level
of Settings. Only account types that have accounts added are visible
here. There is an Add account button to add a new account.
Master sync toggle has moved to Data Usage screen in the overflow menu.
It shows additional detail of the function of the auto-sync toggle when
it is toggled by the user.
Account type screen (ManageAccountsSettings) shows list of accounts of
that type and any available authenticator settings. It additionally
verifies any Intents can be resolved before showing the corresponding
entry. This screen now shows last synced time for each account.
You can now sync all accounts of a type by selecting Sync now in the
Account type screen.
Account Sync screen that shows the list of syncable items has minor
tweaks:
- "Last synced...", "Sync is OFF"
- Doesn't show the authenticator settings here anymore.
Bug: 6579937
Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
2012-06-04 17:01:22 -07:00
Eric Fischer
635d8610d7
am 13b2f06d
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '13b2f06d2e5a74a52bc00b21f91d720407f5a98d':
Import translations. DO NOT MERGE
2012-06-02 08:34:51 -07:00
Brian Colonna
900922773a
am af197847
: Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
...
* commit 'af197847164bd0229e7ef51114cd17fc43b35a15':
Bug 5457035: Changed strings in FUL anti-spoofing setup
2012-06-01 19:02:04 -07:00
Eric Fischer
13b2f06d2e
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-01 18:10:52 -07:00
Brian Colonna
af19784716
Merge "Bug 5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
2012-06-01 14:45:56 -07:00
Brian Colonna
e06fb708f0
Bug 5457035: Changed strings in FUL anti-spoofing setup
...
Added latest string changes requested for Face Unlock
liveness/head-turn anti-spoofing option.
Change-Id: Ic703bda6b449756bdf05d7de843e9aab6b939446
2012-06-01 16:37:06 -04:00
Eric Fischer
360f219816
Import translations. DO NOT MERGE
...
Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
2012-06-01 12:28:50 -07:00
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
96e2a62a46
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-31 15:48:12 -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
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
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
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
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
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
a2d5540731
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-30 13:50:22 -07:00
Eric Fischer
1b2e4b8e14
Import translations. DO NOT MERGE
...
Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
2012-05-30 13:37:01 -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
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
Jeff Brown
693d7b7449
Make string bigger for localization.
...
Bug: 6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
2012-05-29 17:26:27 -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
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
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
00d60cf723
Import translations. DO NOT MERGE
...
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
2012-05-29 14:15:59 -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
Eric Fischer
1b46022b41
am a56e2362
: Import translations. DO NOT MERGE
...
* commit 'a56e2362b12cf94045145975d6ce1fa5d0c35aea':
Import translations. DO NOT MERGE
2012-05-25 15:43:45 -07:00
Eric Fischer
a56e2362b1
Import translations. DO NOT MERGE
...
Change-Id: Ia98a540aa471fa330bfa066330d0e48e058f4798
2012-05-25 14:48:17 -07:00
Jeff Brown
303beea9b4
am 60111cf0
: Merge "String change." into jb-dev
...
* commit '60111cf073af774250517bcab0f888f91f6f4750':
String change.
2012-05-24 15:20:21 -07:00
Jeff Brown
60111cf073
Merge "String change." into jb-dev
2012-05-24 15:18:16 -07:00
Jeff Brown
0e3232fea0
String change.
...
Change-Id: Ic2d52977682d1074ce37df219db4c0a199d50196
2012-05-24 15:01:33 -07:00
Christian Robertson
f4ef0edffd
am 27c20291
: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev
...
* commit '27c2029128d2d9909eced0bb7d7c56755d85de17':
Updating launcher icon to fix alignment. Bug: 6511716
2012-05-23 14:04:40 -07:00
Christian Robertson
27c2029128
Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev
2012-05-23 14:01:46 -07:00
Christian Robertson
93d6c74090
Updating launcher icon to fix alignment. Bug: 6511716
...
Change-Id: I912c356fcd61414394ef9318568491b68a63b724
2012-05-23 11:59:53 -07:00
Michael Kolb
34382357f5
am 9d5a6eb4
: Match setup wizard wifi settings with new wireframes
...
* commit '9d5a6eb4d7ec662e666dc5dfe1506616d5b59341':
Match setup wizard wifi settings with new wireframes
2012-05-23 11:31:51 -07:00
Michael Kolb
9d5a6eb4d7
Match setup wizard wifi settings with new wireframes
...
Bug: 6521472
Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
2012-05-23 11:19:47 -07:00
Andrew Flynn
f89dc7c93a
am be4a0325
: Merge "Update WPS Dialog" into jb-dev
...
* commit 'be4a032581ae6dfb41662486085e64052d085314':
Update WPS Dialog
2012-05-22 11:41:21 -07:00
Andrew Flynn
be4a032581
Merge "Update WPS Dialog" into jb-dev
2012-05-22 11:39:30 -07:00