Eric Fischer
76a3696496
Import translations. DO NOT MERGE
...
Change-Id: Ib14c978b6abf1ac248953e2f4b03c71222b58c96
2012-03-19 14:29:16 -07:00
Eric Fischer
bb43919bbb
Import translations. DO NOT MERGE
...
Change-Id: Ie27bb5431e3356c30867fc25d00037b3b567da5c
2012-03-19 14:28:34 -07:00
The Android Automerger
dc02117230
merge in jb-release history after reset to master
2012-03-19 07:05:34 -07:00
Jason Chen
3f49e65fc3
am b0362b1b
: am d5f7e6cd
: [DO NOT MERGE] Revert "Update string in Settings"
...
* commit 'b0362b1bb0a3288c8de2cd8d0e5efd44ec1a831e':
2012-03-16 17:29:35 -07:00
Jason Chen
9b06ca9476
am 8f393645
: am d5f7e6cd
: [DO NOT MERGE] Revert "Update string in Settings"
...
* commit '8f393645e9b66235760c3e3c9b1dd9d999ed03f1':
[DO NOT MERGE] Revert "Update string in Settings"
2012-03-16 17:27:13 -07:00
Jason Chen
b0362b1bb0
am d5f7e6cd
: [DO NOT MERGE] Revert "Update string in Settings"
...
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
[DO NOT MERGE] Revert "Update string in Settings"
2012-03-16 17:26:29 -07:00
Jason Chen
d6c1c58af2
am 80f2b063
: (-s ours) am d5f7e6cd
: [DO NOT MERGE] Revert "Update string in Settings"
...
* commit '80f2b06330accf1e4f51bc4846edf1e1409899f1':
[DO NOT MERGE] Revert "Update string in Settings"
2012-03-16 16:35:56 -07:00
Jason Chen
80f2b06330
am d5f7e6cd
: [DO NOT MERGE] Revert "Update string in Settings"
...
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
[DO NOT MERGE] Revert "Update string in Settings"
2012-03-16 16:33:10 -07:00
Jason Chen
8f393645e9
am d5f7e6cd
: [DO NOT MERGE] Revert "Update string in Settings"
...
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
[DO NOT MERGE] Revert "Update string in Settings"
2012-03-16 16:32:30 -07:00
Jason Chen
d5f7e6cd6b
[DO NOT MERGE] Revert "Update string in Settings"
...
This reverts commit 23d0b5287a
.
2012-03-16 16:18:51 -07:00
Jason Chen
3180a46c4b
am 0eb3a3fc
: am 23d0b528
: Update string in Settings
...
* commit '0eb3a3fc4e25d4df6379d775269f561f66748c8d':
2012-03-16 14:21:08 -07:00
Jason Chen
bb4133b1f6
am dd6c0d61
: am 23d0b528
: Update string in Settings
...
* commit 'dd6c0d61d7a3c605be2d402c3cd2586c539df81c':
Update string in Settings
2012-03-16 14:19:03 -07:00
Jason Chen
800d263c2d
am 23d0b528
: Update string in Settings
...
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings
2012-03-16 14:16:49 -07:00
Jason Chen
dd6c0d61d7
am 23d0b528
: Update string in Settings
...
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings
2012-03-16 14:16:17 -07:00
Jason Chen
0eb3a3fc4e
am 23d0b528
: Update string in Settings
...
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings
2012-03-16 14:16:17 -07:00
Eric Fischer
d88d7daf1b
Import translations. DO NOT MERGE
...
Change-Id: I8d12690747947a87a4fdcc6aa1b8e9c641802bf5
2012-03-16 14:11:46 -07:00
Jason Chen
23d0b5287a
Update string in Settings
...
Bug: 6183254
Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
2012-03-16 11:31:19 -07:00
Jeff Sharkey
f5091acc8d
Merge "Auto grid lines, lower minimum, disable estimates."
2012-03-15 18:41:26 -07:00
Jeff Sharkey
a8106f248c
Auto grid lines, lower minimum, disable estimates.
...
Show automatic grid lines with power-of-two spacing, avoiding ANR
when trying to render thousands of gridlines. Lower minimum chart
height to 50MB to give better view of linear data. Also disable
estimates rendering.
Bug: 5500204, 6005240
Change-Id: Iacfed11b32c0095c9c2d08bee6a1b5e29637de98
2012-03-15 18:38:36 -07:00
Jeff Sharkey
4d28820b7e
Merge "Avoid Data Usage AppDetailsFragment ISE."
2012-03-15 16:57:51 -07:00
Jeff Sharkey
3235ddb7aa
Avoid Data Usage AppDetailsFragment ISE.
...
Bug: 6022913
Change-Id: I4672b327096add4beeeb52f0bb467622b3467fcf
2012-03-15 16:40:31 -07:00
Eric Fischer
5981e0ef09
Import translations. DO NOT MERGE
...
Change-Id: Ic216c073a9621e953fb5ef6ed36ffdd59ad39660
2012-03-15 14:36:44 -07:00
The Android Automerger
eb2ecf9004
merge in jb-release history after reset to master
2012-03-15 09:00:23 -07:00
Eric Fischer
7181da4718
Merge "Import translations. DO NOT MERGE"
2012-03-14 15:43:29 -07:00
Eric Fischer
4489a890b1
Import translations. DO NOT MERGE
...
Change-Id: Ibb5f856dcee5229da8d143a28a058729810ad83d
2012-03-14 14:12:26 -07:00
The Android Automerger
8a7251773d
merge in jb-release history after reset to master
2012-03-14 07:05:36 -07:00
Jake Hamby
a9534367b5
Fix IME soft keyboard for Bluetooth rename device dialog.
...
The soft keyboard should automatically pop up when the user selects
the Bluetooth rename device menu item. Fixed by calling
setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE) on the Window
containing the AlertDialog before showing.
The device name field should also be a single line field, with the
Done button causing the device to be renamed. Set the "singleLine"
attribute in the layout XML to true, and added a
TextView.OnEditorActionListener to set the device name and dismiss
the dialog for EditorInfo.IME_ACTION_DONE.
Bug: 5342542
Bug: 5343354
Change-Id: I550d8e9a59395ad66f8a9c11d29c0f2ef278c196
2012-03-13 20:08:22 -07:00
Eric Fischer
4f85e85666
Merge "Import translations. DO NOT MERGE"
2012-03-13 15:14:08 -07:00
Eric Fischer
8d3c1b51c6
Import translations. DO NOT MERGE
...
Change-Id: If243350912de447caaf65ae0d3fe1e0d4d639fd4
2012-03-13 15:09:56 -07:00
Irfan Sheriff
42f0f19b47
Merge "Enhance static IP UI"
2012-03-13 14:28:39 -07:00
Irfan Sheriff
db529dd66b
Enhance static IP UI
...
Based on the IP address provided, choose a default gateway, network prefix
and DNS to reduce typing for common scenarios
Bug: 6006249
Change-Id: I27878ce7895386b744013f267d29b3309208ec07
2012-03-13 11:16:14 -07:00
The Android Automerger
ede843358f
merge in jb-release history after reset to master
2012-03-13 07:05:18 -07:00
Eric Fischer
e9aa05829c
Import translations. DO NOT MERGE
...
Change-Id: I3e41f60d64f58cd7b999359e7aea7461c9a40a32
2012-03-12 14:51:05 -07:00
Irfan Sheriff
87a59e84c2
Merge "Increase char limit"
2012-03-12 10:38:19 -07:00
Irfan Sheriff
6e0ddded14
Increase char limit
...
Bug: 6126418
Change-Id: I1addfec2dd8810028cd0e19c27eff5602358c6b9
2012-03-12 10:13:54 -07:00
The Android Automerger
b1e41368d9
merge in jb-release history after reset to master
2012-03-12 07:05:44 -07:00
Jeff Sharkey
3f3a7f5400
Merge "Save timezone when setting data cycle reset date."
2012-03-09 18:33:51 -08:00
Jeff Sharkey
e5223a0577
Save timezone when setting data cycle reset date.
...
Bug: 5938567
Change-Id: I9df8da9d030169952098efc04cfde79e3e42e1f8
2012-03-09 18:24:01 -08:00
Irfan Sheriff
32a67b3df3
Merge "Fix p2p settings NPE"
2012-03-09 16:27:59 -08:00
Irfan Sheriff
a318d1e821
Fix p2p settings NPE
...
Bug: 6138959
Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707
2012-03-09 15:18:42 -08:00
Eric Fischer
4409a951ae
Import translations. DO NOT MERGE
...
Change-Id: I3c88f810d7ef01a594865e8102048c0090dde1f5
2012-03-09 13:31:11 -08:00
Irfan Sheriff
891b3ca807
Merge "Use a different place holder name for string"
2012-03-09 01:17:50 -08:00
Eric Fischer
2e103b6a36
Merge "Import translations. DO NOT MERGE"
2012-03-08 17:45:43 -08:00
Irfan Sheriff
b7e2467adf
Use a different place holder name for string
...
Bug: 6132597
Change-Id: Ie6bf125413da4c1bcd288ae329e6d0f07200db85
2012-03-08 16:51:39 -08:00
Amith Yamasani
66f185a9e2
Fix NPE due to removed preference.
...
Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
2012-03-08 15:54:34 -08:00
Eric Fischer
be14916066
Import translations. DO NOT MERGE
...
Change-Id: I8b363dd496956ef7205b7d22a7ff6a080398d0e3
2012-03-08 13:40:33 -08:00
Amith Yamasani
d220c8a6fe
Fix NPE due to removed preference.
...
Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
2012-03-08 11:15:49 -08:00
The Android Automerger
7ebc29ddf5
merge in jb-release history after reset to master
2012-03-08 07:04:58 -08:00
Eric Fischer
e90f31596b
Merge "Import translations. DO NOT MERGE"
2012-03-07 15:17:40 -08:00
Eric Fischer
2e613d138f
Import translations. DO NOT MERGE
...
Change-Id: I0a6f821b47bcd8d1a67f6c7436eb79b5bd9b6798
2012-03-07 14:09:26 -08:00