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
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
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
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
c9bd848b11
Merge "BUG 5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
2012-05-31 08:44:09 -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
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
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
The Android Open Source Project
e34d0df2b4
Reconcile with jb-release
...
Change-Id: Ia54294c438373cc24703fc93bbd95f4b936d668a
2012-05-30 10:16:25 -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
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
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
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
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
6de0ec640d
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-29 14:34:03 -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
a18016940f
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I96cdf547dadf2a15abbb73874390620639dae0c6
2012-05-29 09:41:21 -07:00