Gilles Debunne
e81d81ceca
am bd8fc0c0
: Merge "Part of Bug 5252423: Crash in summary text when time out is 0"
...
* commit 'bd8fc0c089265206abc1767e6e8da0b871a06ff3':
Part of Bug 5252423: Crash in summary text when time out is 0
2011-09-02 17:11:17 -07:00
Gilles Debunne
bd8fc0c089
Merge "Part of Bug 5252423: Crash in summary text when time out is 0"
2011-09-02 17:10:03 -07:00
Jeff Sharkey
bb2a564c31
am 28130d96
: Unify data/power layout, confirm disable, round.
...
* commit '28130d96385d7d7b17992b45fb5d124836d85880':
Unify data/power layout, confirm disable, round.
2011-09-02 16:40:38 -07:00
Jeff Sharkey
28130d9638
Unify data/power layout, confirm disable, round.
...
Share consistent layout between data usage and battery usage. Show
confirmation dialog before disabling mobile data. Round warning/limit
sweep values to match displayed label. Suppress fade when switching
data usage tabs.
Bug: 5208510, 5058157, 5038589, 5252816
Change-Id: I3c76f3397445d2d3b173666a41672871df4c61af
2011-09-02 16:15:25 -07:00
Gilles Debunne
698c24fcf0
Part of Bug 5252423: Crash in summary text when time out is 0
...
Negative value will show no summary.
Zero is no longer a special case. It will display the first summary, like any
value below it.
Change-Id: I88d49cac844fb2dc347bef94ac033df9255d748f
2011-09-02 15:47:26 -07:00
Jean Chalard
dac1ef4005
am 4e658ba9
: Fix an NPE
...
* commit '4e658ba969830e8c9617dc8938271df1ed09aa44':
Fix an NPE
2011-09-02 08:12:22 -07:00
Jean Chalard
4e658ba969
Fix an NPE
...
It seems the user dictionary fragment does not tolerate being
called by name, and needs to be called only by action.
Bug: 5242122
Change-Id: I6b954db549b98d4d0076fdce8e00d336fc18b6e3
2011-09-02 21:44:12 +09:00
Irfan Sheriff
ffd2eafe1d
am eb913af2
: Merge "Remove device name and display debug setting"
...
* commit 'eb913af2a663dc1a0f7d758a041503d6adf1381c':
Remove device name and display debug setting
2011-09-01 21:48:41 -07:00
Irfan Sheriff
eb913af2a6
Merge "Remove device name and display debug setting"
2011-09-01 21:46:43 -07:00
Ben Komalo
6a7b1ba95d
am f3a3d04b
: Merge "Fix order of buttons for device admin toggle"
...
* commit 'f3a3d04bba3441318d27db4e3845dc5ad44459d6':
Fix order of buttons for device admin toggle
2011-09-01 16:54:49 -07:00
Ben Komalo
f3a3d04bba
Merge "Fix order of buttons for device admin toggle"
2011-09-01 16:09:30 -07:00
Ben Komalo
1743c15749
Fix order of buttons for device admin toggle
...
Bug: 5156853
Change-Id: Ia70d5f42909d8983a0858ed67d32df12c049f420
2011-09-01 16:01:34 -07:00
Irfan Sheriff
e964d57152
Remove device name and display debug setting
...
Device name in WifiP2pConfig is going away
Bug: 5247957
Change-Id: Ib6ada8420ed8e7fbfcab85eee5f1665e33e8f024
2011-09-01 15:01:03 -07:00
Amith Yamasani
2f444f9039
am 1679b2c2
: Merge "Ignore the volume hard keys in Volume settings screen."
...
* commit '1679b2c2e67f9accc58766a23ac852be762cff20':
Ignore the volume hard keys in Volume settings screen.
2011-09-01 14:51:10 -07:00
Amith Yamasani
1679b2c2e6
Merge "Ignore the volume hard keys in Volume settings screen."
2011-09-01 14:49:08 -07:00
Amith Yamasani
e9d8ff9d4b
am 9bc770b0
: Merge "Use the same empty message for user dictionary on tablets and phones."
...
* commit '9bc770b0b750a6c9511e106c8b6580a81ca792e3':
Use the same empty message for user dictionary on tablets and phones.
2011-09-01 14:49:08 -07:00
Amith Yamasani
9bc770b0b7
Merge "Use the same empty message for user dictionary on tablets and phones."
2011-09-01 14:48:15 -07:00
Ben Komalo
918847e5f8
am 4853d276
: Merge "Misc UI fixes for settings (mostly cryptkeeper)"
...
* commit '4853d2762858ba12f570b8b8dcea805bcb0d6865':
Misc UI fixes for settings (mostly cryptkeeper)
2011-09-01 14:20:45 -07:00
Ben Komalo
4853d27628
Merge "Misc UI fixes for settings (mostly cryptkeeper)"
2011-09-01 14:19:18 -07:00
Svetoslav Ganov
21c168a9f7
am 76631f3a
: Merge "Update of accessibility settings"
...
* commit '76631f3a907a4f2986608f170490b615f464051d':
Update of accessibility settings
2011-09-01 13:28:53 -07:00
Kenny Root
7261e1d8dd
am 3a79bad4
: Merge "Intent.getAction() can return null"
...
* commit '3a79bad40933166ff4c20d9eafc6aa3edbea1ea1':
Intent.getAction() can return null
2011-09-01 13:27:16 -07:00
Justin Ho
65e7c136cb
am 24e07307
: Merge "Remove unreferenced assets in Settings Bug: 5032006"
...
* commit '24e073071df2b61afb6ba8b31206bef71cc22b91':
Remove unreferenced assets in Settings Bug: 5032006
2011-09-01 13:26:20 -07:00
Robert Greenwalt
d383ea6be5
am 7edbc609
: Merge "Use the new isNetworkSupported api for wifi-only"
...
* commit '7edbc609fdccff3367b119da46ff1adbe4477d10':
Use the new isNetworkSupported api for wifi-only
2011-09-01 13:25:42 -07:00
Svetoslav Ganov
76631f3a90
Merge "Update of accessibility settings"
2011-09-01 12:11:30 -07:00
Ben Komalo
9cec1becd6
Misc UI fixes for settings (mostly cryptkeeper)
...
- fix padding issues in a lot of cryptkeeper screens
- fix sizing of clock that didn't fit anymore with the new font
- change titles from green to the new holo blue
Bug: 5247866
Change-Id: Ib934e9661c32cce26e1af40eaff133bae11f78dc
2011-09-01 10:42:45 -07:00
Kenny Root
3a79bad409
Merge "Intent.getAction() can return null"
2011-09-01 10:42:32 -07:00
Svetoslav Ganov
ea5a50a708
Update of accessibility settings
...
1. Removed the global toggle switch - now each accessibility
feature has to be turned on or off separately.
2. Added a setting for the screen rotation (same as Dispaly)
since most of blind users want that behavior.
bug:5166161
bug:5127475
Change-Id: I659aef62a8499461075f43520a3008fa7b8ff911
2011-09-01 10:25:23 -07:00
Justin Ho
24e073071d
Merge "Remove unreferenced assets in Settings Bug: 5032006"
2011-09-01 09:40:10 -07:00
Kenny Root
762eaa77e3
Intent.getAction() can return null
...
Make sure we don't rely on action being non-null when it could be. This
fixes some paths into this Settings screen.
Bug: 5246883
Change-Id: I13e247ff95f389a45f5031a559d5ca4914082af3
2011-09-01 09:39:33 -07:00
Robert Greenwalt
7edbc609fd
Merge "Use the new isNetworkSupported api for wifi-only"
2011-09-01 08:45:09 -07:00
Justin Ho
64485f37f4
Remove unreferenced assets in Settings
...
Bug: 5032006
Change-Id: I61b02d1ff01f03903171cf0e3a343133360362c7
2011-09-01 08:35:46 -07:00
Jean Chalard
7dddf91518
am 7fe1435b
: Fix a string that was forgotten
...
* commit '7fe1435b5e6c1de4b5ad5852c11ecb42c433ddd2':
Fix a string that was forgotten
2011-09-01 05:29:07 -07:00
Jean Chalard
7fe1435b5e
Fix a string that was forgotten
...
Bug: 5066983
Change-Id: I3daa0d9b37b05c07280d24fdcac0b4342cc11831
2011-09-01 20:58:21 +09:00
Jean Chalard
981b6614b5
am dbb3afd7
: Merge "Update settings wording for ICS"
...
* commit 'dbb3afd7edba73b8930db785a193f063beebe906':
Update settings wording for ICS
2011-09-01 04:43:40 -07:00
Jean Chalard
dbb3afd7ed
Merge "Update settings wording for ICS"
2011-09-01 04:40:13 -07:00
Jean Chalard
8ba5c42b21
Update settings wording for ICS
...
Bug: 5069983
Change-Id: I882aded067e8cc75197f6d3fa5c11388368b6996
2011-09-01 20:38:52 +09:00
Jake Hamby
54033c30c6
am 9a4543e1
: Fix unresponsive UI during scan and display of "No Bluetooth devices"
...
* commit '9a4543e1de4251463cf14150260baaf8753bd3c0':
Fix unresponsive UI during scan and display of "No Bluetooth devices"
2011-08-31 18:06:01 -07:00
Jake Hamby
9a4543e1de
Fix unresponsive UI during scan and display of "No Bluetooth devices"
...
- When there are no available Bluetooth devices, we show
"No Bluetooth devices were found nearby" as a preference item after
the scan completes. Update the layout for this Preference item so
that the text is centered and doesn't highlight when touched.
- Fix slow responsiveness on scanning caused by repeated removal of
"No Bluetooth devices were found" preference item on every call to
onBindView().
- If no devices are paired, don't restart the scan on every rotation.
Bug: 5173935
Bug: 5055460
Change-Id: I52fb2d52f315c5e793f08499146842d54c5c3ead
2011-08-31 17:18:36 -07:00
Robert Greenwalt
8af88fb838
Use the new isNetworkSupported api for wifi-only
...
Didn't have an API for this before so people used a hacked system property (ro.carrier)
to determine if the device supported mobile data. Added new API and switching callsites.
bug:5087537
Change-Id: Ibd799559be102a9e2fd552d1a23d1afbcf8f4614
2011-08-31 16:45:39 -07:00
Ben Komalo
29d5c41f76
am be4fa0bf
: Merge "Misc fixes to CryptKeeper"
...
* commit 'be4fa0bf95006c8c8e4471c9122c771def38f13b':
Misc fixes to CryptKeeper
2011-08-31 15:07:09 -07:00
Ben Komalo
be4fa0bf95
Merge "Misc fixes to CryptKeeper"
2011-08-31 15:05:07 -07:00
Irfan Sheriff
bca7ab632d
am f38534f4
: Merge "Expose wifi p2p toggle switch to user"
...
* commit 'f38534f4b5d9f37753ccdffea3337b6f11cb8375':
Expose wifi p2p toggle switch to user
2011-08-31 12:53:14 -07:00
Irfan Sheriff
f38534f4b5
Merge "Expose wifi p2p toggle switch to user"
2011-08-31 12:52:12 -07:00
Irfan Sheriff
1610a74a26
Expose wifi p2p toggle switch to user
...
We will not show the Wifi p2p settings to user but the turn on/off capability
is exposed to the user and applications will be expected to let user turn on
and turn off p2p at launch.
Remove the compound button integration from the settings page.
Bug: 5242230
Change-Id: I54ec307304256b051e85201b8bb829d0e5544bfc
2011-08-31 11:54:46 -07:00
Amith Yamasani
8d04c8c02e
am ca6d987a
: Merge "Fix a bug in disabling wifi tethering on a wifi-only device."
...
* commit 'ca6d987a87698cda7ca216adb8e827b30111f984':
Fix a bug in disabling wifi tethering on a wifi-only device.
2011-08-31 11:36:39 -07:00
Amith Yamasani
ca6d987a87
Merge "Fix a bug in disabling wifi tethering on a wifi-only device."
2011-08-31 11:35:12 -07:00
Amith Yamasani
0f47465a3f
Fix a bug in disabling wifi tethering on a wifi-only device.
...
Bug: 5116955
Change-Id: I924915efbd46f918bd94c124f10389912fddf41a
2011-08-31 10:48:36 -07:00
satok
23eb372c8a
am 14413a02
: Add a functionality to disable the spell checker
...
* commit '14413a02e3ce8a2f128ec8eccdb648420e0b9297':
Add a functionality to disable the spell checker
2011-08-31 05:59:31 -07:00
satok
14413a02e3
Add a functionality to disable the spell checker
...
Change-Id: I2c2663e8232c5ba4b7499fd17a173c8c65252cf3
2011-08-31 21:15:53 +09:00
satok
1fea4943ac
am 8ff6222a
: Fix the visibility of preferences in the input method settings
...
* commit '8ff6222a9136cdbaeea9191869b90abd179efc85':
Fix the visibility of preferences in the input method settings
2011-08-31 04:48:01 -07:00