OSDN Git Service
Amith Yamasani [Tue, 5 Jun 2012 16:21:32 +0000 (09:21 -0700)]
am
227edcf6: am
03295520: Merge "Account types at toplevel of Settings" into jb-dev
* commit '
227edcf61abaf91001d9061537d66e0aad64a4ee':
Account types at toplevel of Settings
Eric Fischer [Tue, 5 Jun 2012 01:21:52 +0000 (18:21 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 5 Jun 2012 01:21:17 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c7237b08abf4857048c808cb3927bd138f7e30d
Amith Yamasani [Tue, 5 Jun 2012 01:05:35 +0000 (18:05 -0700)]
am
03295520: Merge "Account types at toplevel of Settings" into jb-dev
* commit '
03295520359e06013d77387979a182845a2b1f1b':
Account types at toplevel of Settings
Amith Yamasani [Tue, 5 Jun 2012 01:02:34 +0000 (18:02 -0700)]
Merge "Account types at toplevel of Settings" into jb-dev
Amith Yamasani [Fri, 18 May 2012 16:50:08 +0000 (09:50 -0700)]
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
Dianne Hackborn [Mon, 4 Jun 2012 22:59:06 +0000 (15:59 -0700)]
am
c2543e8f: am
883329ca: Fix issue #
6603152: User-adjustable autobrightness broken?
* commit '
c2543e8f4e6c80ec506a72f96108b672b9fb4049':
Fix issue #
6603152: User-adjustable autobrightness broken?
Dianne Hackborn [Mon, 4 Jun 2012 22:53:06 +0000 (15:53 -0700)]
am
883329ca: Fix issue #
6603152: User-adjustable autobrightness broken?
* commit '
883329ca1376054228ff67a923252121b5531265':
Fix issue #
6603152: User-adjustable autobrightness broken?
Dianne Hackborn [Mon, 4 Jun 2012 22:32:54 +0000 (15:32 -0700)]
Fix issue #
6603152: User-adjustable autobrightness broken?
Two issues:
- The new brightness was not being applied when switching out
of auto-brightness mode.
- We were resetting to the last brightness level when switching
modes. This is because at that point we read the current
brightness setting, but that isn't changed as the user adjusts
only when the final value is committed. To fix this, we have
a new local variable keeping track of the last brightness value
we have shown and use that when we haven't committed the
brightness to settings.
Change-Id: I7cc02c9f90128eacec427587a3f6b8f25ede4bd3
Irfan Sheriff [Mon, 4 Jun 2012 19:05:37 +0000 (12:05 -0700)]
am
80497db4: am
98894ed4: Merge "Fix crash when accessibility is on" into jb-dev
* commit '
80497db44479936391c8cc8e885240407a0ba372':
Fix crash when accessibility is on
Irfan Sheriff [Mon, 4 Jun 2012 19:00:35 +0000 (12:00 -0700)]
am
98894ed4: Merge "Fix crash when accessibility is on" into jb-dev
* commit '
98894ed4106222b79c7ca67d5b3995878e8ae98d':
Fix crash when accessibility is on
Irfan Sheriff [Mon, 4 Jun 2012 18:55:45 +0000 (11:55 -0700)]
Merge "Fix crash when accessibility is on" into jb-dev
Irfan Sheriff [Mon, 4 Jun 2012 17:21:11 +0000 (10:21 -0700)]
Fix crash when accessibility is on
Bug:
6600699
Change-Id: I9eb8b9871d1368bd7508873951d5719e1f2ba826
Eric Fischer [Sat, 2 Jun 2012 15:39:56 +0000 (08:39 -0700)]
am
635d8610: (-s ours) am
13b2f06d: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
635d8610d7b66072aca8874a953e7fb97bcb2a61':
Import translations. DO NOT MERGE
Eric Fischer [Sat, 2 Jun 2012 15:34:51 +0000 (08:34 -0700)]
am
13b2f06d: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
13b2f06d2e5a74a52bc00b21f91d720407f5a98d':
Import translations. DO NOT MERGE
Brian Colonna [Sat, 2 Jun 2012 15:19:44 +0000 (08:19 -0700)]
am
90092277: am
af197847: Merge "Bug
5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
* commit '
900922773a70b73d93a55da52f0b974ac89677a1':
Bug
5457035: Changed strings in FUL anti-spoofing setup
Brian Colonna [Sat, 2 Jun 2012 02:02:04 +0000 (19:02 -0700)]
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
Eric Fischer [Sat, 2 Jun 2012 01:10:52 +0000 (18:10 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Brian Colonna [Fri, 1 Jun 2012 21:45:56 +0000 (14:45 -0700)]
Merge "Bug
5457035: Changed strings in FUL anti-spoofing setup" into jb-dev
Brian Colonna [Fri, 1 Jun 2012 20:37:06 +0000 (16:37 -0400)]
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
Eric Fischer [Fri, 1 Jun 2012 19:30:44 +0000 (12:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If23b7efd7868dedab4db9b0384ca7a2760bb6a7b
Eric Fischer [Fri, 1 Jun 2012 19:28:50 +0000 (12:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id95cfc21f742d95cdb4b8ca7530c4410faaaba63
Eric Fischer [Thu, 31 May 2012 22:54:44 +0000 (15:54 -0700)]
am
9512935e: (-s ours) am
96e2a62a: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9512935e21d2b29933b5e5282b038ca36ffcf1e0':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 31 May 2012 22:52:02 +0000 (15:52 -0700)]
am
96e2a62a: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
96e2a62a464c1c1d9866c6ab515ed2f78ab11a62':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 31 May 2012 22:48:42 +0000 (15:48 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 31 May 2012 22:48:12 +0000 (15:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Amith Yamasani [Thu, 31 May 2012 22:33:45 +0000 (15:33 -0700)]
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
Amith Yamasani [Thu, 31 May 2012 22:31:11 +0000 (15:31 -0700)]
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
Amith Yamasani [Thu, 31 May 2012 22:27:19 +0000 (15:27 -0700)]
Merge "Reword the summary text for Unknown sources in Security Settings" into jb-dev
Irfan Sheriff [Thu, 31 May 2012 22:11:25 +0000 (15:11 -0700)]
am
078f1325: am
c26c2f22: Merge "Fetch peers after preferenceScreen is ready" into jb-dev
* commit '
078f1325aa10de073112bdc38a2d78267318b5eb':
Fetch peers after preferenceScreen is ready
Irfan Sheriff [Thu, 31 May 2012 22:08:44 +0000 (15:08 -0700)]
am
c26c2f22: Merge "Fetch peers after preferenceScreen is ready" into jb-dev
* commit '
c26c2f22042b676539f664002ec51ce78d276b62':
Fetch peers after preferenceScreen is ready
Irfan Sheriff [Thu, 31 May 2012 22:04:53 +0000 (15:04 -0700)]
Merge "Fetch peers after preferenceScreen is ready" into jb-dev
Eric Fischer [Thu, 31 May 2012 21:29:54 +0000 (14:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b3d8deb06e253d4b1149abe371d7e4144b781d2
Eric Fischer [Thu, 31 May 2012 21:28:01 +0000 (14:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I508ef274b0aa63d2505a2db40534697b6b266666
Amith Yamasani [Thu, 31 May 2012 20:12:13 +0000 (13:12 -0700)]
Reword the summary text for Unknown sources in Security Settings
Don't use "non-Market" to describe unknown sources.
Bug:
6586626
Change-Id: I2ab440e9db1592ea8b398bd9466ff2f05ca5f6ce
Irfan Sheriff [Thu, 31 May 2012 19:42:25 +0000 (12:42 -0700)]
Fetch peers after preferenceScreen is ready
Bug:
6450152
Change-Id: Ic95c7fdba5fa7cb54b0c54ed9a423e0e0683ad2f
Irfan Sheriff [Thu, 31 May 2012 19:27:02 +0000 (12:27 -0700)]
am
945a36f6: am
5388bc88: Merge "Fix poor network detection setting" into jb-dev
* commit '
945a36f621a5406b20602dd4080fcd59f8a9950f':
Fix poor network detection setting
Irfan Sheriff [Thu, 31 May 2012 19:25:04 +0000 (12:25 -0700)]
am
5388bc88: Merge "Fix poor network detection setting" into jb-dev
* commit '
5388bc88bdf045a461c52856e9bc2de9f1664acf':
Fix poor network detection setting
Irfan Sheriff [Thu, 31 May 2012 19:22:30 +0000 (12:22 -0700)]
Merge "Fix poor network detection setting" into jb-dev
Irfan Sheriff [Thu, 31 May 2012 18:15:41 +0000 (11:15 -0700)]
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
Uriel Rodriguez [Thu, 31 May 2012 15:49:36 +0000 (08:49 -0700)]
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
Uriel Rodriguez [Thu, 31 May 2012 15:46:45 +0000 (08:46 -0700)]
am
c9bd848b: Merge "BUG
5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
* commit '
c9bd848b11c126642ec20c67cc03908f1f445bec':
BUG
5457035 : Anti-spoofing : DO NOT MERGE
Uriel Rodriguez [Thu, 31 May 2012 15:44:09 +0000 (08:44 -0700)]
Merge "BUG
5457035 : Anti-spoofing : DO NOT MERGE" into jb-dev
satok [Thu, 31 May 2012 15:05:53 +0000 (08:05 -0700)]
am
04b85275: am
15065213: Do not show security warning for the system IMEs
* commit '
04b85275707b5171cd45ce4d7ba1a5cfac084ea8':
Do not show security warning for the system IMEs
satok [Thu, 31 May 2012 15:03:48 +0000 (08:03 -0700)]
am
15065213: Do not show security warning for the system IMEs
* commit '
15065213620da656c210f356c1111e7382f5be73':
Do not show security warning for the system IMEs
satok [Thu, 31 May 2012 14:43:37 +0000 (23:43 +0900)]
Do not show security warning for the system IMEs
Bug:
6587127
Change-Id: I00584fb81cf5b39806c30a801b215a0e9a1e9399
Uriel Rodriguez [Wed, 30 May 2012 23:55:12 +0000 (19:55 -0400)]
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
Jeff Brown [Wed, 30 May 2012 22:12:20 +0000 (15:12 -0700)]
am
6e0902b4: am
caaa850f: Merge "Fix comparison of device source bits." into jb-dev
* commit '
6e0902b43e86e7a25fdea1ae1b979ca091fc1a17':
Fix comparison of device source bits.
Jeff Brown [Wed, 30 May 2012 22:07:05 +0000 (15:07 -0700)]
am
caaa850f: Merge "Fix comparison of device source bits." into jb-dev
* commit '
caaa850ffb143edd827cf2a9b9e49b37e9aa777d':
Fix comparison of device source bits.
Jeff Brown [Wed, 30 May 2012 22:00:50 +0000 (15:00 -0700)]
Merge "Fix comparison of device source bits." into jb-dev
Jeff Brown [Wed, 30 May 2012 21:33:16 +0000 (14:33 -0700)]
Fix comparison of device source bits.
Bug:
6576743
Change-Id: I123307defc32a84a965590fbded95c6997260675
Danielle Millett [Wed, 30 May 2012 21:07:31 +0000 (14:07 -0700)]
Merge "Added head turn option for Face Unlock."
Eric Fischer [Wed, 30 May 2012 20:57:00 +0000 (13:57 -0700)]
am
62dd9132: (-s ours) am
a2d55407: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
62dd9132f13cbd0d78228268c45b310414ec7d0c':
Import translations. DO NOT MERGE
Danielle Millett [Wed, 30 May 2012 19:50:03 +0000 (15:50 -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
Eric Fischer [Wed, 30 May 2012 20:54:39 +0000 (13:54 -0700)]
am
a2d55407: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
a2d55407317b50f86069f9e9feb6a0478ee3b1f9':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 30 May 2012 20:50:30 +0000 (13:50 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 30 May 2012 20:50:22 +0000 (13:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Wed, 30 May 2012 20:38:53 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I578587dcb77558da9529bf6a409c849492508f9b
Eric Fischer [Wed, 30 May 2012 20:37:01 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I45c903dfad7e0b599f9b29b3c4f472d3daf9b25d
The Android Open Source Project [Wed, 30 May 2012 17:22:00 +0000 (10:22 -0700)]
am
e34d0df2: Reconcile with jb-release
* commit '
e34d0df2b45258fafa0faa76dd55b658a777c637':
Surface metered networks as "Mobile hotspots."
The Android Open Source Project [Wed, 30 May 2012 17:16:25 +0000 (10:16 -0700)]
Reconcile with jb-release
Change-Id: Ia54294c438373cc24703fc93bbd95f4b936d668a
Amith Yamasani [Wed, 30 May 2012 17:00:18 +0000 (10:00 -0700)]
am
6eddf3eb: am
8242901e: Merge "Adjust layout to avoid clipping." into jb-dev
* commit '
6eddf3eb1ab28d252d49022774fc7e9fcde5f252':
Adjust layout to avoid clipping.
Amith Yamasani [Wed, 30 May 2012 16:57:47 +0000 (09:57 -0700)]
am
8242901e: Merge "Adjust layout to avoid clipping." into jb-dev
* commit '
8242901e1682826137208bfe2fe35c8f50fa0be8':
Adjust layout to avoid clipping.
Amith Yamasani [Wed, 30 May 2012 16:55:45 +0000 (09:55 -0700)]
Merge "Adjust layout to avoid clipping." into jb-dev
The Android Automerger [Wed, 30 May 2012 14:05:36 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Svetoslav Ganov [Wed, 30 May 2012 03:06:30 +0000 (20:06 -0700)]
am
d3c16b49: am
a99d1125: Merge "Lock screen rotation accessibility preference not updated." into jb-dev
* commit '
d3c16b49fb08608af6431379513d6605eab32718':
Lock screen rotation accessibility preference not updated.
Svetoslav Ganov [Wed, 30 May 2012 03:04:43 +0000 (20:04 -0700)]
am
a99d1125: Merge "Lock screen rotation accessibility preference not updated." into jb-dev
* commit '
a99d1125e2ede99391e8cff6c4bee179fdc81d06':
Lock screen rotation accessibility preference not updated.
Svetoslav Ganov [Wed, 30 May 2012 03:02:50 +0000 (20:02 -0700)]
Merge "Lock screen rotation accessibility preference not updated." into jb-dev
Dianne Hackborn [Wed, 30 May 2012 02:16:33 +0000 (19:16 -0700)]
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.
Dianne Hackborn [Wed, 30 May 2012 02:13:56 +0000 (19:13 -0700)]
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.
Dianne Hackborn [Wed, 30 May 2012 02:09:45 +0000 (19:09 -0700)]
Merge "Fix issue where Manage Apps would not start on correct page." into jb-dev
Jeff Brown [Wed, 30 May 2012 01:14:05 +0000 (18:14 -0700)]
am
7a5a3b9c: am
66a55562: Merge "Make string bigger for localization." into jb-dev
* commit '
7a5a3b9c4e397383b192bd9a61b904f53e93381e':
Make string bigger for localization.
Jeff Brown [Wed, 30 May 2012 01:10:20 +0000 (18:10 -0700)]
am
66a55562: Merge "Make string bigger for localization." into jb-dev
* commit '
66a55562c7848d7616196238605e7970d231d22b':
Make string bigger for localization.
Jeff Brown [Wed, 30 May 2012 01:05:35 +0000 (18:05 -0700)]
Merge "Make string bigger for localization." into jb-dev
Svetoslav Ganov [Wed, 30 May 2012 00:36:48 +0000 (17:36 -0700)]
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
Jeff Brown [Wed, 30 May 2012 00:26:27 +0000 (17:26 -0700)]
Make string bigger for localization.
Bug:
6575551
Change-Id: Ia13043325bc9fe28e36a0047dba5313900ab91d2
Dianne Hackborn [Wed, 30 May 2012 00:21:05 +0000 (17:21 -0700)]
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
Jeff Sharkey [Tue, 29 May 2012 17:19:50 +0000 (10:19 -0700)]
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
Amith Yamasani [Tue, 29 May 2012 22:49:29 +0000 (15:49 -0700)]
Adjust layout to avoid clipping.
Fixes the WiFi AP dialogs getting clipped at the right edge.
Bug:
6525128
Change-Id: Ic1c5c682d51e1492fe3c739c01255db886a90518
Jeff Sharkey [Tue, 29 May 2012 22:04:52 +0000 (15:04 -0700)]
am
27143c0b: am
16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
* commit '
27143c0b54638f29dd0aa0095ff2505e3adac827':
Surface metered networks as "Mobile hotspots."
Jeff Sharkey [Tue, 29 May 2012 22:03:13 +0000 (15:03 -0700)]
am
16bf0e0e: Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
* commit '
16bf0e0ec7dbd606ea5a5c8a1a9653f1cbb6d9b6':
Surface metered networks as "Mobile hotspots."
Jeff Sharkey [Tue, 29 May 2012 22:01:33 +0000 (15:01 -0700)]
Merge "Surface metered networks as "Mobile hotspots."" into jb-dev
Eric Fischer [Tue, 29 May 2012 21:40:36 +0000 (14:40 -0700)]
am
ad23b800: (-s ours) am
6de0ec64: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
ad23b800e1d23ac6fd61ad82acb35de5f224aca2':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 21:37:07 +0000 (14:37 -0700)]
am
6de0ec64: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
6de0ec640d4ddd618b7f9fa7c9fc131d13979b97':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 29 May 2012 21:34:03 +0000 (14:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Amith Yamasani [Tue, 29 May 2012 21:18:46 +0000 (14:18 -0700)]
am
baf9b5fb: am
35ff41b5: Merge "Retain text in Rename Device dialog." into jb-dev
* commit '
baf9b5fb05f046d3dea8f6c9b7334867a0c57fd8':
Retain text in Rename Device dialog.
Amith Yamasani [Tue, 29 May 2012 21:16:15 +0000 (14:16 -0700)]
am
35ff41b5: Merge "Retain text in Rename Device dialog." into jb-dev
* commit '
35ff41b5f7928acaa5112051f519e3333106d239':
Retain text in Rename Device dialog.
Eric Fischer [Tue, 29 May 2012 21:15:59 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46077aeea1d55b35eddd45138c09d25bf3df4aa6
Amith Yamasani [Tue, 29 May 2012 21:13:50 +0000 (14:13 -0700)]
Merge "Retain text in Rename Device dialog." into jb-dev
Amith Yamasani [Tue, 29 May 2012 20:19:26 +0000 (13:19 -0700)]
Retain text in Rename Device dialog.
Also, show the current device name in the dialog, if available.
Bug:
6508967
Change-Id: I34d420e197796352aeab74121bdee55c2d2854d7
Jeff Sharkey [Tue, 29 May 2012 17:19:50 +0000 (10:19 -0700)]
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
The Android Open Source Project [Tue, 29 May 2012 16:44:57 +0000 (09:44 -0700)]
am
a1801694: Reconcile with jb-release nakasi-factoryrom-release
* commit '
a18016940f7eeeaab032d8a089aafec0278ef45e':
The Android Open Source Project [Tue, 29 May 2012 16:41:21 +0000 (09:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I96cdf547dadf2a15abbb73874390620639dae0c6
The Android Automerger [Tue, 29 May 2012 16:00:37 +0000 (09:00 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Fri, 25 May 2012 23:46:19 +0000 (16:46 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 25 May 2012 22:46:27 +0000 (15:46 -0700)]
am
1b46022b: (-s ours) am
a56e2362: Import translations. DO NOT MERGE
* commit '
1b46022b4155cf68ddf072f99186df4f009c63b4':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 22:43:45 +0000 (15:43 -0700)]
am
a56e2362: Import translations. DO NOT MERGE
* commit '
a56e2362b12cf94045145975d6ce1fa5d0c35aea':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 21:50:06 +0000 (14:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idb949bd15f7b38df8ecc3314c0f0441688e4f2bd
Eric Fischer [Fri, 25 May 2012 21:48:17 +0000 (14:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia98a540aa471fa330bfa066330d0e48e058f4798
Amith Yamasani [Fri, 25 May 2012 17:21:56 +0000 (10:21 -0700)]
am
f007430e: am
a5ac7ce5: Merge "Don\'t show SIM LOCK settings if there\'s no Icc card." into jb-dev
* commit '
f007430ed5aa1e1218caae9de6dded511c5d761f':
Don't show SIM LOCK settings if there's no Icc card.
OSDN Git Service
