Andrew Flynn
cb0b0916fd
am f2c3939e: am a4139dc0: Merge "Hide Back button when requesting intent says to" into jb-dev
...
* commit 'f2c3939e894c462a4ae27949aca5848db02354a6':
Hide Back button when requesting intent says to
2012-05-09 01:54:37 -07:00
Amith Yamasani
5b171edb6a
am b5b56d71: am 95a893be: Merge "Avoid split action bar on phones." into jb-dev
...
* commit 'b5b56d714d13de65efaae09228834bbc16732262':
Avoid split action bar on phones.
2012-05-09 01:54:37 -07:00
Jean Chalard
ddd335a013
am 87adf141: am fbffd0c9: Move the word commit code to UserDictionaryAddWordContent.
...
* commit '87adf141544c34580ff8b71944bcff83c166bde1':
Move the word commit code to UserDictionaryAddWordContent.
2012-05-09 01:54:36 -07:00
Jean Chalard
723d2103c1
am 377d594f: am be3f0faf: Factor some code
...
* commit '377d594f672d50f777ca8d809591ed02246a1cc6':
Factor some code
2012-05-09 01:54:35 -07:00
Jean Chalard
819a65968f
am 1d9e8f88: am be07e49a: Implement the "add word" screen according to new spec
...
* commit '1d9e8f88b587770fd405a62268a4cfb8322927b6':
Implement the "add word" screen according to new spec
2012-05-09 01:54:34 -07:00
Jean Chalard
7bd36b22f4
am 20d065a5: am b9f837dd: Fix a janky transition
...
* commit '20d065a520a24eba1fe6f43ece936397fb91b9ad':
Fix a janky transition
2012-05-09 01:54:34 -07:00
Amith Yamasani
20309b4c97
am cb8711ec: am 184ae2c3: Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
...
* commit 'cb8711ec13c4c0a03f8163b250ca4b7928e1db51':
Reduce the amount of I/O done on the UI thread.
2012-05-09 01:54:33 -07:00
Irfan Sheriff
086ff1d706
am 341e518b: am 63f7f5cd: Merge "Remove poor connection UI with watchdog disabled" into jb-dev
...
* commit '341e518b51511a2166a2c5b5395be28e9afedd89':
Remove poor connection UI with watchdog disabled
2012-05-09 01:54:32 -07:00
Irfan Sheriff
d89a4df611
am 1fa8454f: am 2bcca59f: Merge "Remove NSD checkbox" into jb-dev
...
* commit '1fa8454f54dd0bdea3f24630cd734408d71d0221':
Remove NSD checkbox
2012-05-09 01:54:32 -07:00
Andrew Flynn
f2c3939e89
am a4139dc0: Merge "Hide Back button when requesting intent says to" into jb-dev
...
* commit 'a4139dc0e5db8eead3bbb4f68167e86a2a6402a5':
Hide Back button when requesting intent says to
2012-05-09 01:48:35 -07:00
Amith Yamasani
b5b56d714d
am 95a893be: Merge "Avoid split action bar on phones." into jb-dev
...
* commit '95a893bebb37844c481c8ca08d10f9bdee1aafd6':
Avoid split action bar on phones.
2012-05-09 01:47:46 -07:00
Jean Chalard
87adf14154
am fbffd0c9: Move the word commit code to UserDictionaryAddWordContent.
...
* commit 'fbffd0c98203c63af85a3fc6d85660b21c211bfe':
Move the word commit code to UserDictionaryAddWordContent.
2012-05-09 01:46:21 -07:00
Jean Chalard
377d594f67
am be3f0faf: Factor some code
...
* commit 'be3f0faf526d628b578b1af6d975c19cfdf8637b':
Factor some code
2012-05-09 01:46:21 -07:00
Jean Chalard
1d9e8f88b5
am be07e49a: Implement the "add word" screen according to new spec
...
* commit 'be07e49a9292b653b923cbfa64dc5c42972ded41':
Implement the "add word" screen according to new spec
2012-05-09 01:46:19 -07:00
Jean Chalard
20d065a520
am b9f837dd: Fix a janky transition
...
* commit 'b9f837dd1da22f41c72e0cdc1454a486dbc6c448':
Fix a janky transition
2012-05-09 01:46:06 -07:00
Amith Yamasani
cb8711ec13
am 184ae2c3: Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
...
* commit '184ae2c3f2339fdbf7c5e538855c0e1afbf58e9e':
Reduce the amount of I/O done on the UI thread.
2012-05-09 01:45:27 -07:00
Irfan Sheriff
341e518b51
am 63f7f5cd: Merge "Remove poor connection UI with watchdog disabled" into jb-dev
...
* commit '63f7f5cda5481f613cf4fc32bf3c3531d731fa59':
Remove poor connection UI with watchdog disabled
2012-05-09 01:44:58 -07:00
Irfan Sheriff
1fa8454f54
am 2bcca59f: Merge "Remove NSD checkbox" into jb-dev
...
* commit '2bcca59f30a69b862808a5778fb1f07909b747d9':
Remove NSD checkbox
2012-05-09 01:44:40 -07:00
Andrew Flynn
a4139dc0e5
Merge "Hide Back button when requesting intent says to" into jb-dev
2012-05-08 15:24:21 -07:00
Eric Fischer
3c1f1b7c82
am f38e48d6: (-s ours) am 0f5c2655: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'f38e48d659cb40a0f231d7d3c7659eb81e7dcc59':
Import translations. DO NOT MERGE
2012-05-08 15:01:56 -07:00
Andrew Flynn
bfff317559
Hide Back button when requesting intent says to
...
Change-Id: I79ed35843500f20367568510ea8df3afe543ede8
2012-05-08 13:50:53 -07:00
Amith Yamasani
95a893bebb
Merge "Avoid split action bar on phones." into jb-dev
2012-05-08 12:22:22 -07:00
Jeff Sharkey
a339cba51a
Avoid split action bar on phones.
...
Change-Id: I6cf8400a09562eb905568cd6681773e94df556d8
2012-05-08 11:42:49 -07:00
Gilles Debunne
7dabe6117d
am ee2a761f: am 36891ee6: Merge "Removed the no longer needed font size span flag fix" into jb-dev
...
* commit 'ee2a761f88a8a5d5603d63a0303fef2c54e2fc01':
Removed the no longer needed font size span flag fix
2012-05-08 11:29:46 -07:00
Jean Chalard
fbffd0c982
Move the word commit code to UserDictionaryAddWordContent.
...
...and call it from the fragment too.
Bug: 6026080
Change-Id: Icb83fd60ed33dfa593124ed0af6b9fff4b63f1f5
2012-05-08 20:47:51 +09:00
Jean Chalard
be3f0faf52
Factor some code
...
Bug: 6026080
Change-Id: I38475a95b1d421162099390244dbda09658346f5
2012-05-08 20:26:59 +09:00
Jean Chalard
be07e49a92
Implement the "add word" screen according to new spec
...
This is only the interface. It doesn't do anything yet, so as to
avoid a too large change.
Bug: 6026080
Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
2012-05-08 20:10:51 +09:00
Jean Chalard
b9f837dd1d
Fix a janky transition
...
Bug: 6026080
Change-Id: I75bd244b2b09c371805a67057d2a9c45dc12f3db
2012-05-08 13:09:39 +09:00
Amith Yamasani
184ae2c3f2
Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
2012-05-07 18:11:28 -07:00
Amith Yamasani
f6d8961843
Reduce the amount of I/O done on the UI thread.
...
There was unnecessary saving of IME settings when changing the state
of the checkboxes, causing ANRs when monkeys are switching between
Settings fragments quickly while other background activity is using
I/O as well. In fact, all I/O should be removed, but this change at least
reduces some of it.
Potential fix for:
Bug: 6414289
Change-Id: Ice96f0f9d921128b27ddbe26519a6791d9f01c75
2012-05-07 17:56:14 -07:00
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
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
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
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