OSDN Git Service
The Android Open Source Project [Thu, 19 Jul 2012 15:41:38 +0000 (08:41 -0700)]
Reconcile with jb-mr0-release jb-release
Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505
The Android Automerger [Thu, 19 Jul 2012 04:44:53 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 19 Jul 2012 03:14:18 +0000 (20:14 -0700)]
am
2bc05a27: Import translations. DO NOT MERGE
* commit '
2bc05a2726935df5a085c78f8c7b0cfcc78aea43':
Import translations. DO NOT MERGE
Ying Wang [Wed, 18 Jul 2012 23:18:09 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
Ying Wang [Tue, 17 Jul 2012 20:41:39 +0000 (13:41 -0700)]
am
fa0f3fe1: Import translations. DO NOT MERGE
* commit '
fa0f3fe16225c57c91c9fe51981dc03f29938746':
Import translations. DO NOT MERGE
Ying Wang [Tue, 17 Jul 2012 19:54:32 +0000 (12:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff
Auto-generated-cl: translation import
Wink Saville [Tue, 17 Jul 2012 19:36:41 +0000 (12:36 -0700)]
am
9ad4a898: (-s ours) Use telephony-common - DO NOT MERGE
* commit '
9ad4a89877363a6f1128b258f6535b29d2f778e2':
Use telephony-common - DO NOT MERGE
The Android Automerger [Tue, 17 Jul 2012 19:31:40 +0000 (12:31 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Wink Saville [Thu, 14 Jun 2012 19:33:43 +0000 (12:33 -0700)]
Use telephony-common - DO NOT MERGE
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
Ying Wang [Mon, 16 Jul 2012 21:25:53 +0000 (14:25 -0700)]
am
66daca6b: Import translations. DO NOT MERGE
* commit '
66daca6b24c166423438a1729b6a1e67d8def5b8':
Import translations. DO NOT MERGE
Ying Wang [Mon, 16 Jul 2012 19:57:58 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief2131970749fdea0ec210f4d9ab309e671eb166
Auto-generated-cl: translation import
Dianne Hackborn [Sat, 14 Jul 2012 00:06:00 +0000 (17:06 -0700)]
am
ea819b07: Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
* commit '
ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6':
Implement issue #
6819955: Add button to take bug report.
Dianne Hackborn [Sat, 14 Jul 2012 00:03:43 +0000 (17:03 -0700)]
Merge "Implement issue #
6819955: Add button to take bug report." into jb-dev
Dianne Hackborn [Fri, 13 Jul 2012 21:26:23 +0000 (14:26 -0700)]
Implement issue #
6819955: Add button to take bug report.
Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:
4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Ying Wang [Fri, 13 Jul 2012 20:51:57 +0000 (13:51 -0700)]
am
4b25c5ad: Import translations. DO NOT MERGE
* commit '
4b25c5ad8236feab94956d4626fe5c1409e5b989':
Import translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 20:09:18 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
Ying Wang [Thu, 12 Jul 2012 21:29:15 +0000 (14:29 -0700)]
am
62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
62acae4f85c937e2f0a883a47b2819f122b84675':
Import translations. DO NOT MERGE
John Wang [Thu, 12 Jul 2012 21:29:13 +0000 (14:29 -0700)]
am
b0b45c02: Display FCC id for LTE in Settings.
* commit '
b0b45c02ec73c87f78a8358a7e98747bd96ec103':
Display FCC id for LTE in Settings.
Ying Wang [Thu, 12 Jul 2012 21:25:51 +0000 (14:25 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Thu, 12 Jul 2012 20:15:15 +0000 (13:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
The Android Automerger [Thu, 12 Jul 2012 06:13:32 +0000 (23:13 -0700)]
merge in jb-mr0-release history after reset to jb-dev
John Wang [Thu, 30 Jun 2011 21:31:44 +0000 (14:31 -0700)]
Display FCC id for LTE in Settings.
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:
4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
Wink Saville [Thu, 14 Jun 2012 19:33:43 +0000 (12:33 -0700)]
Use telephony-common
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
Ying Wang [Tue, 10 Jul 2012 21:23:12 +0000 (14:23 -0700)]
am
efc229b3: Import translations. DO NOT MERGE
* commit '
efc229b3c3c969eef1d32d62435741228b96aeb9':
Import translations. DO NOT MERGE
Ying Wang [Tue, 10 Jul 2012 20:42:00 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
Ying Wang [Mon, 9 Jul 2012 21:01:43 +0000 (14:01 -0700)]
am
051619c0: Import translations. DO NOT MERGE
* commit '
051619c06338f776fd361c313b515c676fb74331':
Import translations. DO NOT MERGE
Ying Wang [Mon, 9 Jul 2012 20:20:45 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
Ying Wang [Tue, 3 Jul 2012 21:56:07 +0000 (14:56 -0700)]
am
39aade5b: Import translations. DO NOT MERGE
* commit '
39aade5b4e6b134bbd3962dc14efc4a9571bb8ab':
Import translations. DO NOT MERGE
Ying Wang [Tue, 3 Jul 2012 20:41:30 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
Irfan Sheriff [Tue, 3 Jul 2012 19:18:35 +0000 (12:18 -0700)]
am
2fad853b: Merge "Limit length of SSID input string to 32"
* commit '
2fad853bf7282676ee3f2ec87630de5fdbcb236b':
Limit length of SSID input string to 32
Irfan Sheriff [Tue, 3 Jul 2012 19:18:33 +0000 (12:18 -0700)]
am
d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"
* commit '
d80ff0a4d615bd6f037483bf9dc2b10887d9507f':
wifi: update text displayed during hotspot on/off
The Android Open Source Project [Tue, 3 Jul 2012 19:12:16 +0000 (12:12 -0700)]
Reconcile with jb-release
Change-Id: I80999c1ca708772a1483e03093144b53b60e5c1e
Irfan Sheriff [Tue, 3 Jul 2012 18:35:43 +0000 (11:35 -0700)]
Merge "Limit length of SSID input string to 32"
Irfan Sheriff [Tue, 3 Jul 2012 18:30:05 +0000 (11:30 -0700)]
Merge "wifi: update text displayed during hotspot on/off"
The Android Automerger [Mon, 2 Jul 2012 23:21:14 +0000 (16:21 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Mon, 2 Jul 2012 21:37:15 +0000 (14:37 -0700)]
am
a1146f83: Import translations. DO NOT MERGE
* commit '
a1146f83a985ce613145ae1e89b9e7311906a3b7':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 2 Jul 2012 20:55:16 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
The Android Automerger [Mon, 2 Jul 2012 19:57:04 +0000 (12:57 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Sat, 30 Jun 2012 00:59:04 +0000 (17:59 -0700)]
am
9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
9ca616e42520ff12de921b8c301ef4cf7cb6c95a':
Import translations. DO NOT MERGE
Ying Wang [Sat, 30 Jun 2012 00:54:50 +0000 (17:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Dianne Hackborn [Fri, 29 Jun 2012 22:43:34 +0000 (15:43 -0700)]
am
313ab172: Fix issue #
6761130: Clearing app data in settings does not clear app\'s USB storage
* commit '
313ab1727014d535790bc89afdcf725ff936e5b4':
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
Dianne Hackborn [Fri, 29 Jun 2012 22:01:23 +0000 (15:01 -0700)]
Fix issue #
6761130: Clearing app data in settings does not clear app's USB storage
The installed app details was not correctly distinguishing between cache and
normal data on external storage. The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.
Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
Ying Wang [Fri, 29 Jun 2012 20:19:19 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
The Android Open Source Project [Fri, 29 Jun 2012 15:14:15 +0000 (08:14 -0700)]
Reconcile with jb-release
Change-Id: Idef831103e3ee313ae771483241391f90f5feafb
The Android Automerger [Fri, 29 Jun 2012 00:11:24 +0000 (17:11 -0700)]
merge in jb-release history after reset to jb-dev
Brian Muramatsu [Thu, 28 Jun 2012 23:56:29 +0000 (16:56 -0700)]
am
beb3d8b1: Merge "Fix Settings NPE" into jb-dev
* commit '
beb3d8b1e06f26c20adc4d4db7a08ac507ad6ab0':
Fix Settings NPE
Brian Muramatsu [Thu, 28 Jun 2012 23:53:47 +0000 (16:53 -0700)]
Merge "Fix Settings NPE" into jb-dev
Eric Fischer [Thu, 28 Jun 2012 21:27:32 +0000 (14:27 -0700)]
am
3cc385b8: Import translations. DO NOT MERGE
* commit '
3cc385b83ca0f2c5e7a6b8464604ec3eb613f235':
Import translations. DO NOT MERGE
Brian Muramatsu [Thu, 28 Jun 2012 21:25:14 +0000 (14:25 -0700)]
Fix Settings NPE
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.
Bug
6727947
Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
Eric Fischer [Thu, 28 Jun 2012 19:51:19 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
The Android Automerger [Thu, 28 Jun 2012 14:04:34 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Thu, 28 Jun 2012 00:21:34 +0000 (17:21 -0700)]
am
c812fe4c: Import translations. DO NOT MERGE
* commit '
c812fe4c0e989fcea906a6dda7c88a55076cd50d':
Import translations. DO NOT MERGE
Ying Wang [Wed, 27 Jun 2012 23:19:29 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
The Android Automerger [Tue, 26 Jun 2012 18:11:58 +0000 (11:11 -0700)]
merge in jb-release history after reset to jb-dev
Jake Hamby [Mon, 25 Jun 2012 23:21:18 +0000 (16:21 -0700)]
am
f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
* commit '
f59dd9d67e269a81c684ecd641e514aba8d2330a':
Add menu item to Settings to go to Cell Broadcast settings.
Jake Hamby [Mon, 25 Jun 2012 23:19:23 +0000 (16:19 -0700)]
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
Eric Fischer [Mon, 25 Jun 2012 20:34:20 +0000 (13:34 -0700)]
am
40b78280: Import translations. DO NOT MERGE
* commit '
40b78280eb0c93d9ee3918813cfabf93a2919f35':
Import translations. DO NOT MERGE
Jake Hamby [Thu, 21 Jun 2012 17:59:22 +0000 (10:59 -0700)]
Add menu item to Settings to go to Cell Broadcast settings.
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).
The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.
Bug:
6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
Eric Fischer [Mon, 25 Jun 2012 20:00:04 +0000 (13:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
The Android Open Source Project [Mon, 25 Jun 2012 14:57:38 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: Ib43ec64c9827ceb6956e4f86dcc9439e8a433e16
Ying Wang [Sat, 23 Jun 2012 12:36:47 +0000 (05:36 -0700)]
am
d7e8025f: Import translations. DO NOT MERGE
* commit '
d7e8025fdf91fd0a6dad9df6bc92e7cb9d7566c2':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 23 Jun 2012 03:38:33 +0000 (20:38 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Fri, 22 Jun 2012 22:07:41 +0000 (15:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
The Android Open Source Project [Fri, 22 Jun 2012 15:17:21 +0000 (08:17 -0700)]
Reconcile with jb-release
Change-Id: I7cd948231f3aa78f5d0a53889ed833af50738452
The Android Automerger [Fri, 22 Jun 2012 00:52:47 +0000 (17:52 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Thu, 21 Jun 2012 22:52:25 +0000 (15:52 -0700)]
am
3c46b110: Import translations. DO NOT MERGE
* commit '
3c46b1103995434045b946a14d9909e866a8c8ab':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 21 Jun 2012 22:04:08 +0000 (15:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
Eric Fischer [Thu, 21 Jun 2012 18:52:14 +0000 (11:52 -0700)]
am
f776a738: Import translations. DO NOT MERGE
* commit '
f776a738fae4bcf0f81d59579a30efd400fbb295':
Import translations. DO NOT MERGE
The Android Automerger [Thu, 21 Jun 2012 14:04:22 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Eric Fischer [Thu, 21 Jun 2012 04:12:09 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
Amith Yamasani [Wed, 20 Jun 2012 22:48:24 +0000 (15:48 -0700)]
am
9938ac8a: Merge "Fix incorrect updating of headers in Settings" into jb-dev
* commit '
9938ac8a6e1885b2cd7f35fd6c63e2b04a84d36c':
Fix incorrect updating of headers in Settings
Amith Yamasani [Wed, 20 Jun 2012 22:45:05 +0000 (15:45 -0700)]
Merge "Fix incorrect updating of headers in Settings" into jb-dev
Ying Wang [Wed, 20 Jun 2012 21:49:14 +0000 (14:49 -0700)]
am
679948df: Import translations. DO NOT MERGE
* commit '
679948df3cf5c71bfe24ad4d6cd1bd78cb0fb28d':
Import translations. DO NOT MERGE
Ying Wang [Wed, 20 Jun 2012 20:54:32 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7d2055b0cf38cf4b676a599fd0c952b2fdac99b1
Amith Yamasani [Wed, 20 Jun 2012 20:51:40 +0000 (13:51 -0700)]
Fix incorrect updating of headers in Settings
Settings was overriding the header list in PreferenceActivity and
maintaining its own. In the case where Settings activity is restored
from saved state, the header lists went out of sync and couldn't
be updated anymore.
This makes use of a new private method in PreferenceActivity to
retrieve the header list object so that they stay in sync and can
be updated.
Also make sure to invalidate headers on resume, so that the latest
account types are loaded.
Bug:
6685701
Change-Id: I76ed1e1579a70fb5abfcea417d7e981907bdc02c
The Android Open Source Project [Wed, 20 Jun 2012 15:26:04 +0000 (08:26 -0700)]
Reconcile with jb-release
Change-Id: I84c9b6e4663448275a78cab4ea14f4952b440c8f
The Android Automerger [Wed, 20 Jun 2012 14:04:02 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Christopher Tate [Tue, 19 Jun 2012 23:34:01 +0000 (16:34 -0700)]
am
5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '
5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
Use string resources instead of literals for backup password confirmations
Christopher Tate [Tue, 19 Jun 2012 23:31:11 +0000 (16:31 -0700)]
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
Eric Fischer [Tue, 19 Jun 2012 23:26:22 +0000 (16:26 -0700)]
am
f4a4119e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
f4a4119eeaed1a99c082f253174b8acbca07c4c2':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 19 Jun 2012 23:23:23 +0000 (16:23 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Christopher Tate [Tue, 19 Jun 2012 22:44:15 +0000 (15:44 -0700)]
Use string resources instead of literals for backup password confirmations
Localizability is good. Bug
6683158
Change-Id: I205e4a09f5137e18d4085fcc041fae86f26ab188
Amith Yamasani [Tue, 19 Jun 2012 23:01:50 +0000 (16:01 -0700)]
am
8e1981cc: Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
* commit '
8e1981ccd314bf3e41601314e78cc9626a4299af':
Show full summary for network location sercice even for wifi-only devices
Eric Fischer [Tue, 19 Jun 2012 23:01:49 +0000 (16:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I097248fa64ec4f5d75ca4ddda3a17d49c29647a7
Amith Yamasani [Tue, 19 Jun 2012 22:59:48 +0000 (15:59 -0700)]
Merge "Show full summary for network location sercice even for wifi-only devices" into jb-dev
Amith Yamasani [Tue, 19 Jun 2012 17:53:49 +0000 (10:53 -0700)]
Show full summary for network location sercice even for wifi-only devices
Bug:
6694051
Change-Id: Ic2446aa640bc2688fd74885eeb55f179c51e7691
The Android Open Source Project [Tue, 19 Jun 2012 14:16:03 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: I2b3e50f3304a3e5bd0e23e70b30db6e10d546f1c
The Android Automerger [Tue, 19 Jun 2012 14:05:23 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:13:55 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ia9498cdf747581bb837e57129b89c4f1e6e15a6f
Ying Wang [Mon, 18 Jun 2012 21:53:11 +0000 (14:53 -0700)]
am
fae5978e: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
fae5978e4a89aa2b8e6a9e1cf95c910a0609923a':
Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 21:51:26 +0000 (14:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 21:40:20 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ba16c5a7895850d429ae355bf2c27e384bb248e
Jim Miller [Mon, 18 Jun 2012 20:22:05 +0000 (13:22 -0700)]
am
284c9872: Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
* commit '
284c9872cea3a5d97e1b1dd0016ac376da695175':
Fix
6663465: remove flagNoEnterAction in favor of actionNext
Jim Miller [Mon, 18 Jun 2012 20:19:42 +0000 (13:19 -0700)]
Merge "Fix
6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev
Dianne Hackborn [Mon, 18 Jun 2012 17:33:07 +0000 (10:33 -0700)]
am
4d8dac07: Merge "Implement issue #
6633077: Improve permissions display for..." into jb-dev
* commit '
4d8dac0792ec7994f9f4cbf2648cf8f3185876ca':
Implement issue #
6633077: Improve permissions display for...
Dianne Hackborn [Mon, 18 Jun 2012 17:33:00 +0000 (10:33 -0700)]
am
ed99a81e: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
ed99a81e1595c25d7070866ee0c2aa1d94103955':
Fix issue #
6664140: Time to lock should work even Stay awake...
Ying Wang [Mon, 18 Jun 2012 17:32:07 +0000 (10:32 -0700)]
am
9d6d89ef: Import translations. DO NOT MERGE
* commit '
9d6d89ef82f07ef54238699619d4875c4f2ae833':
Import translations. DO NOT MERGE
The Android Automerger [Sat, 16 Jun 2012 14:04:45 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Jim Miller [Sat, 16 Jun 2012 00:56:49 +0000 (17:56 -0700)]
Fix
6663465: remove flagNoEnterAction in favor of actionNext
This fixes a bug where the return key was showing in some layouts
for choose/confirm password screens in Settings. Now we just use
"actionNext" which ensures we see consistent behavior across
devices.
Change-Id: I4bf3033654b85f14c55de6f418caaf1ce563c33a
OSDN Git Service
