Amith Yamasani
34aee7798b
am 89ec55c9
: am dad6577f
: Merge "Remove popup indicator for dialog style preferences." into honeycomb
...
* commit '89ec55c9b6b388b1daf877cd9c93a692f3bdb42c':
Remove popup indicator for dialog style preferences.
2011-01-12 15:07:21 -08:00
Amith Yamasani
89ec55c9b6
am dad6577f
: Merge "Remove popup indicator for dialog style preferences." into honeycomb
...
* commit 'dad6577fdd694482cb9ea4469cafed9d17b06635':
Remove popup indicator for dialog style preferences.
2011-01-12 15:03:00 -08:00
Amith Yamasani
dad6577fdd
Merge "Remove popup indicator for dialog style preferences." into honeycomb
2011-01-12 14:44:01 -08:00
Amith Yamasani
be6fab0d6d
Remove popup indicator for dialog style preferences.
...
Bug: 3341160
This is for some custom settings that needed dialog style indicators.
Change-Id: Ied9d88c890e764bc0ae50e0299daff50a6b432aa
2011-01-12 14:18:58 -08:00
Jason parks
8fd5bc9e6f
Move the CryptKeeper to Settings.
...
Change-Id: I59e46366e1911ae7fd37f07719f1e7ba0825733c
2011-01-12 16:04:51 -06:00
Fabrice Di Meglio
70bc797a92
Fix bug #2987804 (Provide a better UI for selecting the Backup account)
...
- make the "Backup account" toggle follow the state of "Back up my data"
- reset Backup account in preferences if needed
Change-Id: Ifdffb9d268a062f6f5ec617bca82699cc46e2b3a
2011-01-12 13:37:40 -08:00
Daisuke Miyakawa
0b481bc06a
am 5b9aec99
: am 4f0cd58e
: Merge "Show password field when authentication failed." into honeycomb
...
* commit '5b9aec99634a5fe4aebacd552d838f8490ff742b':
Show password field when authentication failed.
2011-01-12 11:06:09 -08:00
Daisuke Miyakawa
5b9aec9963
am 4f0cd58e
: Merge "Show password field when authentication failed." into honeycomb
...
* commit '4f0cd58e86c173672099f02f94b8a4a3bead574d':
Show password field when authentication failed.
2011-01-12 11:04:19 -08:00
Daisuke Miyakawa
4f0cd58e86
Merge "Show password field when authentication failed." into honeycomb
2011-01-12 11:02:04 -08:00
Daisuke Miyakawa
cde3083fb5
Show password field when authentication failed.
...
- add onAuthenticationFailure() method to prepare
appropriate UIs.
- set "edit" boolean to true so that users can modify
password when re-seleting a network.
- keep mStatusText shown for simplicity. It has been hidden
during "editing" phase, but we don't need to do that any more
- modify Connect button handling so that the button
hides/appears at appropriate time
- manage visibility state of some fields so that
we can "reset" the status when authentication failed
- show keyboard again when password field re-appears
Bug: 3330109
Change-Id: I1cdf0573280ab46882117e21501a43a447e50b40
2011-01-12 09:59:43 -08:00
Amith Yamasani
ed0e35b0c4
am 78e088a6
: am eaf3d4c9
: Merge "Remove extra button bar." into honeycomb
...
* commit '78e088a66e3c205274c9189cf14f459b5e55b45a':
Remove extra button bar.
2011-01-12 09:17:22 -08:00
Amith Yamasani
78e088a66e
am eaf3d4c9
: Merge "Remove extra button bar." into honeycomb
...
* commit 'eaf3d4c95dd442bf5b53db5a467afbd4456be6e4':
Remove extra button bar.
2011-01-12 09:15:44 -08:00
Amith Yamasani
eaf3d4c95d
Merge "Remove extra button bar." into honeycomb
2011-01-12 09:14:27 -08:00
Amith Yamasani
9e3a4700b6
Remove extra button bar.
...
Bug: 3058024
Change-Id: Ib3c2620869729f8916178ea0c0e899635b470a8f
2011-01-12 09:12:20 -08:00
satok
e8dbd2a9e0
am f6f52a9a
: am e43bc7ee
: Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb
...
* commit 'f6f52a9aa2c72539e5d9f2c1765cd45f8fa1fd88':
Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257
2011-01-12 01:21:54 -08:00
satok
f6f52a9aa2
am e43bc7ee
: Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb
...
* commit 'e43bc7ee22a633a1ba257f5d2201e1884710b350':
Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257
2011-01-12 01:20:20 -08:00
satok
e43bc7ee22
Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb
2011-01-12 01:18:06 -08:00
Jake Hamby
35704b2a10
am 015506ac
: am 55b7d279
: Only show "Allow incoming file transfer" option if device supports OPP
...
* commit '015506acdca0c238422e7e3f1fd9c621b365b274':
Only show "Allow incoming file transfer" option if device supports OPP
2011-01-11 20:08:41 -08:00
Jake Hamby
015506acdc
am 55b7d279
: Only show "Allow incoming file transfer" option if device supports OPP
...
* commit '55b7d27936f39c2d6e609c15b1086e9698dbbcfd':
Only show "Allow incoming file transfer" option if device supports OPP
2011-01-11 20:06:07 -08:00
Jake Hamby
55b7d27936
Only show "Allow incoming file transfer" option if device supports OPP
...
In the Bluetooth profiles settings screen for a device, the "Allow
incoming file transfer" item should only be shown if the device
supports the Object Push Profile.
Bug: 3297633
Change-Id: I4bbe66ef901feef9dd8a3916fb9827120c1fdfc0
2011-01-11 19:27:17 -08:00
Jake Hamby
22a11202b7
am f3e37b4c
: am 055c20e5
: Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb
...
* commit 'f3e37b4c782ac114a1e58fb1ec43f60af85f328d':
Allow multiple simultaneous connections for BT input devices.
2011-01-11 18:49:04 -08:00
Jake Hamby
f3e37b4c78
am 055c20e5
: Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb
...
* commit '055c20e5760e20dec7661df6deb6cd7fd426103a':
Allow multiple simultaneous connections for BT input devices.
2011-01-11 18:47:02 -08:00
Jake Hamby
055c20e576
Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb
2011-01-11 18:44:57 -08:00
Eric Fischer
cb9a94161d
am 5d59d048
: am 77057e28
: Merge "Update large-screen translations." into honeycomb
...
* commit '5d59d048eb5f967c1f844e934beb1669ae004c15':
Update large-screen translations.
2011-01-11 17:45:37 -08:00
Eric Fischer
5d59d048eb
am 77057e28
: Merge "Update large-screen translations." into honeycomb
...
* commit '77057e282b575a77ee9a4cf8e1a63bc510b0fd2f':
Update large-screen translations.
2011-01-11 17:43:17 -08:00
Eric Fischer
77057e282b
Merge "Update large-screen translations." into honeycomb
2011-01-11 17:39:47 -08:00
Irfan Sheriff
89bf040e01
am 5fd91135
: am 282ef24a
: Merge "Change wifi sleep policy" into honeycomb
...
* commit '5fd911351d96ccdd7e1def74fcdda142e35836ab':
Change wifi sleep policy
2011-01-11 17:31:08 -08:00
Irfan Sheriff
5fd911351d
am 282ef24a
: Merge "Change wifi sleep policy" into honeycomb
...
* commit '282ef24a3aa3ecf14cf68892406daba0858b6fa4':
Change wifi sleep policy
2011-01-11 17:28:41 -08:00
Irfan Sheriff
282ef24a3a
Merge "Change wifi sleep policy" into honeycomb
2011-01-11 17:26:41 -08:00
Roy West
e9e563a68a
am 16115c22
: am 89b32ab6
: First part of fix to bug3094381 typos.
...
* commit '16115c2207cb8bdf89fd40ee0da2a7c3ece66682':
First part of fix to bug3094381 typos.
2011-01-11 17:22:51 -08:00
Roy West
16115c2207
am 89b32ab6
: First part of fix to bug3094381 typos.
...
* commit '89b32ab65d4d9a3d13a0dd16dd26b68f5baeb2bd':
First part of fix to bug3094381 typos.
2011-01-11 17:21:24 -08:00
Roy West
89b32ab65d
First part of fix to bug3094381 typos.
...
Change-Id: Ie2ef07473ae88c023aa9158d12b73dc833043767
2011-01-11 17:17:46 -08:00
Eric Fischer
a793c57291
Update large-screen translations.
...
Change-Id: I618d7e146195a9ce2c5a1f7fc5656b174fd9fcef
2011-01-11 17:01:53 -08:00
Roy West
22c5163361
am d1d4b268
: am 7d47f2f9
: Fix bug 3342149, edit lock screen settings text.
...
* commit 'd1d4b26894fac88d9790816087a4ceafbc847dd3':
Fix bug 3342149, edit lock screen settings text.
2011-01-11 15:46:22 -08:00
Roy West
d1d4b26894
am 7d47f2f9
: Fix bug 3342149, edit lock screen settings text.
...
* commit '7d47f2f9bad77d472b49b88a1c927d07694fff12':
Fix bug 3342149, edit lock screen settings text.
2011-01-11 15:43:40 -08:00
Irfan Sheriff
7f9413911d
Change wifi sleep policy
...
Keep wifi sleep policy as never when charged as long as
user has not changed the settings
Bug: 3038345
Change-Id: I37548984698dd3dd407785544d7b418439ed95d0
2011-01-11 15:39:16 -08:00
Roy West
7d47f2f9ba
Fix bug 3342149, edit lock screen settings text.
...
Change-Id: Ic6691b5ebce1c074143dbe49b0486f693e4236f6
2011-01-11 15:36:29 -08:00
Jeff Brown
fb7ccf5611
am 6a7250b1
: am 8c1524d3
: Merge "Disable quicklaunch settings preference." into honeycomb
...
* commit '6a7250b1e9be7bd52a32a83306f554f3748ac88c':
Disable quicklaunch settings preference.
2011-01-11 15:25:18 -08:00
Jeff Brown
6a7250b1e9
am 8c1524d3
: Merge "Disable quicklaunch settings preference." into honeycomb
...
* commit '8c1524d37adf46a0738b51dbf8c7a1c895761b1f':
Disable quicklaunch settings preference.
2011-01-11 15:22:35 -08:00
Jeff Brown
8c1524d37a
Merge "Disable quicklaunch settings preference." into honeycomb
2011-01-11 15:09:05 -08:00
Amith Yamasani
ca90bfed64
am 76ea0aa7
: am c35b1a23
: Fix build breakage. Order of product="" is important.
...
* commit '76ea0aa7464304711060ccebda3e24eb15dad57c':
Fix build breakage. Order of product="" is important.
2011-01-11 14:25:18 -08:00
Amith Yamasani
76ea0aa746
am c35b1a23
: Fix build breakage. Order of product="" is important.
...
* commit 'c35b1a23596ca9d9afc241008cc621927fffe43c':
Fix build breakage. Order of product="" is important.
2011-01-11 14:23:03 -08:00
Amith Yamasani
c35b1a2359
Fix build breakage. Order of product="" is important.
...
Change-Id: I3232966b90879118e287de77450d736daa58a169
2011-01-11 14:18:44 -08:00
Jim Miller
e3d11cae40
am 264f36f8
: am 7d8afd76
: Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb
...
* commit '264f36f8db0f55369193c4cbc0c27013123aefa1':
Fix 3298889: Show continue button on PIN and password screens
2011-01-11 13:56:04 -08:00
Jake Hamby
fe9f08610c
am 815df293
: am 31a07143
: Merge "Don\'t throw exception on unexpected BT device addition." into honeycomb
...
* commit '815df2935978c3a5623fe28cf1970d5e39f6b95a':
Don't throw exception on unexpected BT device addition.
2011-01-11 13:54:01 -08:00
Jim Miller
264f36f8db
am 7d8afd76
: Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb
...
* commit '7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e':
Fix 3298889: Show continue button on PIN and password screens
2011-01-11 13:53:21 -08:00
Jake Hamby
815df29359
am 31a07143
: Merge "Don\'t throw exception on unexpected BT device addition." into honeycomb
...
* commit '31a071432ee036c828b8df67a6d33f438d7efe5f':
Don't throw exception on unexpected BT device addition.
2011-01-11 13:51:26 -08:00
Jim Miller
7d8afd76f8
Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb
2011-01-11 13:50:40 -08:00
Jake Hamby
31a071432e
Merge "Don't throw exception on unexpected BT device addition." into honeycomb
2011-01-11 13:49:17 -08:00
Jake Hamby
c6e1b293a7
Don't throw exception on unexpected BT device addition.
...
Fix for reported bug where settings app crashes while trying to share
a picture. Bug report showed IllegalStateException thrown with message
"Got onDeviceAdded, but cachedDevice already exists." Changed code to
print an error message to the log and ignore the unexpected event,
rather than throwing an uncaught exception that crashes the app.
Bug: 2192884
Change-Id: I016be6a1616b317b2289768d18ae9f069a49445e
2011-01-11 13:27:50 -08:00