Daisuke Miyakawa
30424e7f42
am ca2870f3: Rename title for Date Time setup
...
* commit 'ca2870f3734a086a8d9a1551af6ecbe8d4828b1f':
Rename title for Date Time setup
2011-01-20 17:14:09 -08:00
Jason parks
739c9a1e7b
am 43775c7f: Merge "More work on the CryptKeeper." into honeycomb
...
* commit '43775c7f9b8a5bc707c678743d8fc0139a426717':
More work on the CryptKeeper.
2011-01-20 17:07:43 -08:00
Jason parks
f947ca5157
am a13e9c87: Merge "Encrypt inplace settings." into honeycomb
...
* commit 'a13e9c877ce4928df0095f47b6117cc4b5403fb2':
Encrypt inplace settings.
2011-01-20 17:07:36 -08:00
Daisuke Miyakawa
596c5e1adc
am 39281d01: Merge "Use new backgrounds in wifi setup for xl" into honeycomb
...
* commit '39281d0163aa410391a128d1d2c8194c88e732fb':
Use new backgrounds in wifi setup for xl
2011-01-20 17:07:03 -08:00
Daisuke Miyakawa
698e4c8dd0
am 392a06ed: Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb
...
* commit '392a06ed1ee529105a46db2efcf08c3b037af9d8':
Let WifiPickerActivity show AdvancedSettings correctly.
2011-01-20 17:04:16 -08:00
Amith Yamasani
fc0968aca6
am 7099436c: Merge "Add back the refresh button and fix refresh when restarted." into honeycomb
...
* commit '7099436ca6e963adae9fe978b39700441446f45d':
Add back the refresh button and fix refresh when restarted.
2011-01-20 17:02:07 -08:00
Daisuke Miyakawa
ca2870f373
Rename title for Date Time setup
...
Bug: 3374552
Change-Id: I37a4ac3f7fb1a9f0cf9624aba2a69dd85e9743ac
2011-01-20 16:31:40 -08:00
Jason parks
43775c7f9b
Merge "More work on the CryptKeeper." into honeycomb
2011-01-20 15:58:02 -08:00
Jason parks
a13e9c877c
Merge "Encrypt inplace settings." into honeycomb
2011-01-20 15:50:55 -08:00
Daisuke Miyakawa
39281d0163
Merge "Use new backgrounds in wifi setup for xl" into honeycomb
2011-01-20 14:59:39 -08:00
Daisuke Miyakawa
392a06ed1e
Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb
2011-01-20 12:39:27 -08:00
Daisuke Miyakawa
ece3bef58d
Let WifiPickerActivity show AdvancedSettings correctly.
...
- stop overwriting EXTRA_SHOW_FRAGMENT
- Show back/next button when WifiPickerActivity is requested
to show them.
Bug: 3362641
Change-Id: Ic06af4796acb1edb659fb99eb8c7d76c430c7798
2011-01-20 12:33:37 -08:00
Daisuke Miyakawa
8f533a6232
Use new backgrounds in wifi setup for xl
...
Bug: 3373467
Change-Id: Iccc9a4c36dc46a67e395c81a642646b8199be606
2011-01-20 12:28:47 -08:00
Amith Yamasani
7099436ca6
Merge "Add back the refresh button and fix refresh when restarted." into honeycomb
2011-01-20 12:08:41 -08:00
Amith Yamasani
1aae305fa0
Add back the refresh button and fix refresh when restarted.
...
Bug: 3364738
Fixes the case where after an orientation change, the battery stats
does not refresh.
Also added back the refresh menu button that was on the phone.
Change-Id: I06c69d17c9945ae976e4e7dc135e2e96242fe721
2011-01-20 11:25:43 -08:00
Roy West
02cfbe9db5
am e97bc56d: Tidy up Internal storage screen text.
...
* commit 'e97bc56db1b84b997467726ca9ecf78193eb03d4':
Tidy up Internal storage screen text.
2011-01-20 10:10:17 -08:00
Roy West
e97bc56db1
Tidy up Internal storage screen text.
...
Change-Id: Ia1b3b79a6df1756c2a4ff9440463771cfa308c13
2011-01-20 10:06:33 -08:00
Ken Wakasa
93a5d80bd9
am 5a813ba7: Refine InputMethodInfo API
...
* commit '5a813ba7f99f1c797ead4a58fdf05f91296158a4':
Refine InputMethodInfo API
2011-01-20 08:14:15 -08:00
Ken Wakasa
5a813ba7f9
Refine InputMethodInfo API
...
bug: 3370297
Change-Id: Ifaaad399586ee5b842f9b7762281d76e7969d24c
2011-01-21 00:46:26 +09:00
Tadashi G. Takaoka
fdcb2f49cf
am 9f732013: Use android.provider.Settings.EXTRA_INPUT_METHOD_ID
...
* commit '9f7320132b7a5e7def378ae754c8c708759a8670':
Use android.provider.Settings.EXTRA_INPUT_METHOD_ID
2011-01-20 07:40:05 -08:00
Tadashi G. Takaoka
9f7320132b
Use android.provider.Settings.EXTRA_INPUT_METHOD_ID
...
This change also fixes the action name of
android.settings.INPUT_METHOD_SUBTYPE_SETTINGS.
Change-Id: Ie08e7f9144f8ff8faa8e7d8edf63fbd59421b18c
2011-01-21 00:13:33 +09:00
Tadashi G. Takaoka
a587afe44d
am 4c0100f4: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
...
* commit '4c0100f48f3e83bc960137e3248d7523fa3d5190':
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
2011-01-20 05:19:30 -08:00
Tadashi G. Takaoka
4c0100f48f
Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
2011-01-20 05:18:01 -08:00
Chia-chi Yeh
2dbfa51069
am 9003862e: Merge "Extract credential storage dialogs to a new activity." into honeycomb
...
* commit '9003862e2548d513bf6d10ee853761ce9a3586d9':
Extract credential storage dialogs to a new activity.
2011-01-20 04:28:16 -08:00
Chia-chi Yeh
9003862e25
Merge "Extract credential storage dialogs to a new activity." into honeycomb
2011-01-20 04:26:10 -08:00
Chia-chi Yeh
91d65a20af
Extract credential storage dialogs to a new activity.
...
Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.
Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d
2011-01-20 19:45:04 +08:00
Chung-yih Wang
279d20b8e3
am a4491eaf: Fix the vpnsetting NPE crash.
...
* commit 'a4491eafd45c460b0317e7962e24d47e3c4206fb':
Fix the vpnsetting NPE crash.
2011-01-20 02:40:42 -08:00
Chung-yih Wang
a4491eafd4
Fix the vpnsetting NPE crash.
...
The bug is triggered by rotating the screen after restoring the
vpn setting which was showing the connect dialog from the recent tasks.
Change-Id: I2562b208fa28f9b6ffa8acba1ab14e0f83b3a0c6
2011-01-20 18:31:26 +08:00
Tadashi G. Takaoka
d38896c7d6
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
...
Change-Id: I2aa16ecfffe3b575132437a9e3a071cd1c747e28
2011-01-20 17:58:29 +09:00
Hung-ying Tyan
b88e702b81
am 62cc79ef: Make VpnSettings use new synchronous VpnService API.
...
* commit '62cc79ef964affaea5ec59c111c01e89f2e0578e':
Make VpnSettings use new synchronous VpnService API.
2011-01-19 22:45:23 -08:00
Hung-ying Tyan
62cc79ef96
Make VpnSettings use new synchronous VpnService API.
...
Change-Id: Ib400c968981f9f8642a1452011faaade0d5bde57
2011-01-20 12:48:53 +08:00
Daisuke Miyakawa
ef07e32e8c
am 9b37821d: Merge "Fix Wifi setup for xl." into honeycomb
...
* commit '9b37821d67f6db1d3d9a9603592e2f053f257fa7':
Fix Wifi setup for xl.
2011-01-19 16:39:12 -08:00
Daisuke Miyakawa
9b37821d67
Merge "Fix Wifi setup for xl." into honeycomb
2011-01-19 16:36:14 -08:00
Daisuke Miyakawa
4781d280d4
Fix Wifi setup for xl.
...
- Show the title "Add network" correctly
- Handle ProgressBar on "Add network" flow correctly
- Handle possible NPE cases.
Bug: 3361270
Change-Id: Ic0fb808086bfce7b0f88e5703e617a62bc71667a
2011-01-19 16:17:56 -08:00
Eric Fischer
d4147929cb
am a934c39d: Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb
...
* commit 'a934c39d19c0a906065193fe913a318a68d5cc1e':
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.
2011-01-19 15:40:02 -08:00
Jake Hamby
ade2349e75
am a76d5390: Merge "Display correct HID icon for pointing and misc. devices" into honeycomb
...
* commit 'a76d53909913324b3e39d3c5edfd7e0c41abbbb0':
Display correct HID icon for pointing and misc. devices
2011-01-19 15:38:03 -08:00
Eric Fischer
a934c39d19
Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb
2011-01-19 15:36:56 -08:00
Jake Hamby
a76d539099
Merge "Display correct HID icon for pointing and misc. devices" into honeycomb
2011-01-19 15:35:50 -08:00
Jake Hamby
cde015b3d4
Display correct HID icon for pointing and misc. devices
...
Added placeholder icons and code for non-keyboard HID devices.
ic_bt_pointing_hid.png - pointing device
ic_bt_misc_hid.png - gamepad, remote control, card reader, etc.
Bug: 3137982
Change-Id: Iac7a53a6fbafa9c6ed794a29aa330da314d580d8
2011-01-19 15:24:39 -08:00
Eric Fischer
de6eb79e15
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.
...
Bug 2605239
Change-Id: I196aadd21281d18e228a7bf7e947a2b0fa7c6d05
2011-01-19 15:16:20 -08:00
Fabrice Di Meglio
3f64106477
am 15649f86: Merge "Fix bug #3366401 (Accounts in "Add accounts" list should be sorted alphabetically)" into honeycomb
...
* commit '15649f86670b9763df45d77d047b736f844e7120':
Fix bug #3366401 (Accounts in "Add accounts" list should be sorted alphabetically)
2011-01-19 14:29:00 -08:00
Fabrice Di Meglio
15649f8667
Merge "Fix bug #3366401 (Accounts in "Add accounts" list should be sorted alphabetically)" into honeycomb
2011-01-19 14:27:11 -08:00
Jake Hamby
cf35b7c362
am 2fdd006b: Add preference to show the list of files received via Bluetooth.
...
* commit '2fdd006b1a625cd20d94861a8c7210f93a283b77':
Add preference to show the list of files received via Bluetooth.
2011-01-19 13:29:24 -08:00
Jake Hamby
d33cc31a61
am 8140d9c9: Add icons for Bluetooth HID and PAN profiles.
...
* commit '8140d9c9166990236e9b15cdefc96d348ba69a53':
Add icons for Bluetooth HID and PAN profiles.
2011-01-19 13:25:22 -08:00
Jake Hamby
2fdd006b1a
Add preference to show the list of files received via Bluetooth.
...
Add a preference item to show a dialog window containing the list
of files received via Bluetooth. This replaces the "live folder"
view that was available in Gingerbread and earlier.
Bug: 3167219
Change-Id: I703266dba47c9ef8c52e5569aba0f812a9511bb5
2011-01-19 13:24:57 -08:00
Jake Hamby
8140d9c916
Add icons for Bluetooth HID and PAN profiles.
...
Add icon resources for Bluetooth keyboard/mouse (HID profile)
and reverse tethering (PAN profile).
Bug: 3137982
Change-Id: Id6c4a9f2b4bee2fdf43626592e32070b49e49d73
2011-01-19 12:25:46 -08:00
satok
5fc9263bc8
am 50265509: Merge "Always clear hashcodes when input method settings is changed" into honeycomb
...
* commit '5026550964ab62ff116958739321493fd8ff4f88':
Always clear hashcodes when input method settings is changed
2011-01-19 07:13:53 -08:00
satok
5026550964
Merge "Always clear hashcodes when input method settings is changed" into honeycomb
2011-01-19 07:11:43 -08:00
satok
517c10dd9c
Always clear hashcodes when input method settings is changed
...
Change-Id: Ia2a5d3a856f0ce9e1c81052397e3d704a3b6b396
2011-01-20 00:07:18 +09:00
Daisuke Miyakawa
1a2dc008ac
am 0692dffa: Fix layout in DateTime picker
...
* commit '0692dffa8eacc0784e98083711e759b9e6b79d30':
Fix layout in DateTime picker
2011-01-18 21:03:44 -08:00