Irfan Sheriff
63f7f5cda5
Merge "Remove poor connection UI with watchdog disabled" into jb-dev
2012-05-07 17:15:21 -07:00
Irfan Sheriff
8f5463dd17
Remove poor connection UI with watchdog disabled
...
Bug: 6449324
Change-Id: I8ddd486ce433b30dd76d385680fdb79d2b90e8eb
2012-05-07 16:53:20 -07:00
Isaac Levy
e7c0d66e26
Fixed 'upto' spelling in WPS messages
...
Change-Id: Ib8c627235de0455c6f239bff77e70080e3080d3d
2012-05-07 16:41:47 -07:00
Irfan Sheriff
2bcca59f30
Merge "Remove NSD checkbox" into jb-dev
2012-05-07 16:37:16 -07:00
Eric Fischer
f38e48d659
am 0f5c2655: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '0f5c2655f56c628a06552acdc82bef5f3007caee':
Import translations. DO NOT MERGE
2012-05-07 16:02:15 -07:00
Eric Fischer
0f5c2655f5
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-07 16:00:06 -07:00
Irfan Sheriff
936e3faae1
Remove NSD checkbox
...
Bug: 6449478
Change-Id: Ic4aa44cb08843819c3290b16d906c989ee306727
2012-05-07 15:51:37 -07:00
Eric Fischer
f2fa44e8cb
Import translations. DO NOT MERGE
...
Change-Id: I9859029eba761f90de6250f97f582d8c6b0954d5
2012-05-07 14:02:44 -07:00
Eric Fischer
7e08807713
Import translations. DO NOT MERGE
...
Change-Id: I5755d0e1a36dab74c96e27361421b0be4dc4d8b9
2012-05-07 14:00:55 -07:00
Amith Yamasani
bfb6a555aa
Appease the monkey gods.
...
Bug: 6443925
Change-Id: Ia36a154d63763d7a3f826a80a5d1ae678b94208e
2012-05-07 11:34:33 -07:00
Gilles Debunne
ee2a761f88
am 36891ee6: Merge "Removed the no longer needed font size span flag fix" into jb-dev
...
* commit '36891ee6df7bad105071e7ac86c45f239576f2af':
Removed the no longer needed font size span flag fix
2012-05-07 11:22:29 -07:00
Gilles Debunne
36891ee6df
Merge "Removed the no longer needed font size span flag fix" into jb-dev
2012-05-07 11:18:44 -07:00
Russell Brenner
766ca884c9
am ab824bb1: am cfadc35a: Add WPS Push Button back into Setup Wizard Wi-Fi
...
* commit 'ab824bb169c478565c363229a42f2c15f7fdb891':
Add WPS Push Button back into Setup Wizard Wi-Fi
2012-05-07 09:51:54 -07:00
Russell Brenner
ab824bb169
am cfadc35a: Add WPS Push Button back into Setup Wizard Wi-Fi
...
* commit 'cfadc35af8236cedb157a89b3c591c1afb2b761c':
Add WPS Push Button back into Setup Wizard Wi-Fi
2012-05-07 09:49:15 -07:00
Russell Brenner
cfadc35af8
Add WPS Push Button back into Setup Wizard Wi-Fi
...
This isn't yet the image button shown in the UX flows, but pending
artwork and some potential tricky Preference layout changes, this
will give access to the WPS functionality.
Bug: 6449333
Change-Id: Ibda0e48cf972dad10c7e92a7482fca9b3c104559
2012-05-06 16:04:08 -07:00
The Android Automerger
4e77fb89db
merge in jb-release history after reset to jb-dev
2012-05-06 14:22:03 -07:00
Vikram Aggarwal
afc54b0cce
am 30ec99e5: am 96d7eaf5: Merge "Center clock on phones" into jb-dev
...
* commit '30ec99e5634e5966804cef0c565bc91bfe922b0e':
Center clock on phones
2012-05-04 16:36:23 -07:00
Vikram Aggarwal
a7dc74324f
am bef77ca1: am 8f04a6fb: Merge "Write the airplane setting in addition to sending the Intent." into jb-dev
...
* commit 'bef77ca177dd23e7a4d557f4a6cac68557a2afeb':
Write the airplane setting in addition to sending the Intent.
2012-05-04 16:35:49 -07:00
Gilles Debunne
a478a1e506
Removed the no longer needed font size span flag fix
...
Related to bug 6448052
A text replacement (as opposed to a deletion) should (and will) not removei
the EXCLUSIVE_EXCLUSIVE spans that have limits identical to the replaced
range of charcters.
Change-Id: Iefaeab9e5119e7223ef6800c55ff0c741976e138
2012-05-04 16:26:11 -07:00
The Android Automerger
c6e6e260bc
merge in jb-release history after reset to jb-dev
2012-05-04 16:16:08 -07:00
Vikram Aggarwal
30ec99e563
am 96d7eaf5: Merge "Center clock on phones" into jb-dev
...
* commit '96d7eaf5f9751ca2b5f4086fb1dae2c6a61227ae':
Center clock on phones
2012-05-04 15:48:26 -07:00
Vikram Aggarwal
96d7eaf5f9
Merge "Center clock on phones" into jb-dev
2012-05-04 15:46:10 -07:00
Vikram Aggarwal
bef77ca177
am 8f04a6fb: Merge "Write the airplane setting in addition to sending the Intent." into jb-dev
...
* commit '8f04a6fb139b9330710b0bb4c714049452d63a48':
Write the airplane setting in addition to sending the Intent.
2012-05-04 14:57:36 -07:00
Vikram Aggarwal
8f04a6fb13
Merge "Write the airplane setting in addition to sending the Intent." into jb-dev
2012-05-04 14:54:37 -07:00
Eric Fischer
f5735b223a
am dec1dd9f: (-s ours) am b9d0f3cb: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'dec1dd9f9eec5c6799227a123ff37245f2d78f1e':
Import translations. DO NOT MERGE
2012-05-04 14:33:49 -07:00
Eric Fischer
dec1dd9f9e
am b9d0f3cb: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'b9d0f3cbb5e8aaf868760db6274592619316debc':
Import translations. DO NOT MERGE
2012-05-04 14:31:07 -07:00
Eric Fischer
f3249fd103
Merge "Import translations. DO NOT MERGE"
2012-05-04 14:27:44 -07:00
Eric Fischer
b9d0f3cbb5
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-04 14:27:35 -07:00
Vikram Aggarwal
6ebbd30e18
Write the airplane setting in addition to sending the Intent.
...
dab was right. :)
Fix b/6006192 in association with https://android-git.corp.google.com/g/187160
Change-Id: I3edfb3191ab35a4e5de1b18f3e2e1dae5f882354
2012-05-04 14:15:55 -07:00
Vikram Aggarwal
eae00d071f
am 85035ffb: am 8b399cc7: Merge "Go into airplane mode in minimal boot mode." into jb-dev
...
* commit '85035ffb0d9e538f54358782410b74a5b53f1798':
Go into airplane mode in minimal boot mode.
2012-05-04 14:12:57 -07:00
Vikram Aggarwal
85035ffb0d
am 8b399cc7: Merge "Go into airplane mode in minimal boot mode." into jb-dev
...
* commit '8b399cc71c960db05aa804c7e982709a1af5502d':
Go into airplane mode in minimal boot mode.
2012-05-04 14:09:38 -07:00
Vikram Aggarwal
8b399cc71c
Merge "Go into airplane mode in minimal boot mode." into jb-dev
2012-05-04 14:05:49 -07:00
Eric Fischer
4612836a39
Import translations. DO NOT MERGE
...
Change-Id: I33ff0fa09d094dffedf055306dbf96dcee283e24
2012-05-04 13:59:28 -07:00
Eric Fischer
eeb3a777a2
Import translations. DO NOT MERGE
...
Change-Id: Ia8f1965490d5e34f0354724471feb2da0ee3b310
2012-05-04 13:57:33 -07:00
Jeff Sharkey
1fdd72078a
am 24845eb0: am 37dfc0c1: Merge "Avoid animation flashing and fix padding." into jb-dev
...
* commit '24845eb0528df2d27d4557e79caa9f65e080acb5':
Avoid animation flashing and fix padding.
2012-05-04 12:08:50 -07:00
Jeff Sharkey
24845eb052
am 37dfc0c1: Merge "Avoid animation flashing and fix padding." into jb-dev
...
* commit '37dfc0c1acc675723e2fb48488e75a72003d63c9':
Avoid animation flashing and fix padding.
2012-05-04 12:07:03 -07:00
Jeff Sharkey
37dfc0c1ac
Merge "Avoid animation flashing and fix padding." into jb-dev
2012-05-04 12:04:18 -07:00
Jeff Sharkey
92811829b3
Avoid animation flashing and fix padding.
...
Bug: 6446203
Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
2012-05-04 11:54:31 -07:00
Jeff Sharkey
599886ed16
am 021452ce: am d8a18ad8: Merge "Better messaging when Wi-Fi disabled." into jb-dev
...
* commit '021452ce21e2ea5ff339c27a3e863d29ecef79e4':
Better messaging when Wi-Fi disabled.
2012-05-04 11:21:19 -07:00
Jeff Sharkey
021452ce21
am d8a18ad8: Merge "Better messaging when Wi-Fi disabled." into jb-dev
...
* commit 'd8a18ad87e930bbcd203ef65563546f13b9bbb8b':
Better messaging when Wi-Fi disabled.
2012-05-04 11:18:31 -07:00
Jeff Sharkey
d8a18ad87e
Merge "Better messaging when Wi-Fi disabled." into jb-dev
2012-05-04 11:15:29 -07:00
Jeff Sharkey
37c222fdf0
Better messaging when Wi-Fi disabled.
...
Bug: 6443166
Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
2012-05-04 10:26:58 -07:00
Vikram Aggarwal
69721802ee
Center clock on phones
...
Fix b/5579000
Change-Id: I80431999939fbecdf693649d58ad2031c03208b0
2012-05-04 10:20:47 -07:00
Wink Saville
f696492bb8
am edcc701d: am 69801b36: Merge "RadioInfo: Update the network type listing"
...
* commit 'edcc701d28217b62aa35fd0d89ff1def38c0de2c':
RadioInfo: Update the network type listing
2012-05-04 09:21:58 -07:00
Wink Saville
edcc701d28
am 69801b36: Merge "RadioInfo: Update the network type listing"
...
* commit '69801b36a1e2b8d5bede15683dceda076e271e67':
RadioInfo: Update the network type listing
2012-05-04 09:18:57 -07:00
Vikram Aggarwal
ea1186db19
Go into airplane mode in minimal boot mode.
...
Fix b/6006192
Change-Id: Ied4d9b51aac4e8ac1d2114aa1e95d4ebbe93413b
2012-05-04 09:18:17 -07:00
satok
622dd278fe
am 259a842b: am 8517794f: Merge "Always on the valid system default ime" into jb-dev
...
* commit '259a842b70ade814239415529b34432d3fe96ce9':
Always on the valid system default ime
2012-05-03 22:18:54 -07:00
satok
259a842b70
am 8517794f: Merge "Always on the valid system default ime" into jb-dev
...
* commit '8517794f1b097cf5c073d81bc6f73fe0b90d01bd':
Always on the valid system default ime
2012-05-03 22:17:22 -07:00
satok
8517794f1b
Merge "Always on the valid system default ime" into jb-dev
2012-05-03 22:15:03 -07:00
Eric Fischer
51b34d0b1b
am abbd68c7: (-s ours) am 0cdc3a1e: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'abbd68c7e0843c2de9bf300c9c2d11b0956634ca':
Import translations. DO NOT MERGE
2012-05-03 16:06:09 -07:00
