Justin Ho
6adc2ee87f
Merge "Updated storage display colors in Settings" into honeycomb-mr1
2011-03-08 14:11:40 -08:00
Justin Ho
bfbe8a07ce
Updated storage display colors in Settings
...
Bug: 3321005
Change-Id: Ia6b254d758beeb755703f5e9c86854079841c59b
2011-03-08 13:57:28 -08:00
Amith Yamasani
1ad4824d84
am 35bc6b5f
: Wifi disconnect policy summary text should not contain "mobile data".
...
* commit '35bc6b5f151ea073522f14067eb92aab3a99bc7d':
Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 13:48:26 -08:00
Amith Yamasani
35bc6b5f15
Wifi disconnect policy summary text should not contain "mobile data".
...
Bug: 4026299
Change the summary if it is a wifi-only device.
Change-Id: I433113d9fc430ab06efec81b6934a03dbb17ca1b
2011-03-08 12:03:13 -08:00
Hung-ying Tyan
f8a3a17c1e
Merge "Don't check states when mActiveProfile is present" into honeycomb-mr1
2011-03-08 07:24:13 -08:00
Eric Fischer
0e1acd4d19
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:06:48 -08:00
Eric Fischer
bf896b047d
Import revised translations. DO NOT MERGE
...
Change-Id: If88ebfce5d7dae236a41644ed9a09b85d1b17157
2011-03-07 12:57:11 -08:00
Vasu Nori
71dee16bc9
Merge "bug:3514023 fix strings" into honeycomb-mr1
2011-03-07 11:45:09 -08:00
Vasu Nori
e875c73505
bug:3514023 fix strings
...
Change-Id: I3662b4eeaa4da9df9d007e3e0ad4a3dd59e429c0
2011-03-07 11:14:27 -08:00
Hung-ying Tyan
68bcab8532
Don't check states when mActiveProfile is present
...
and is in IDLE state. checkVpnConnectionStatus() will clean up mActiveProfile
if it's IDLE.
Bug: 3513962
Change-Id: I8289fa321fdbd46def9c8207cef79cb45509897a
2011-03-06 01:53:45 +08:00
Dianne Hackborn
3f1d39193e
Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1
2011-03-04 18:28:48 -08:00
Dianne Hackborn
e2e7cf650d
Cherry-pick from master: Fix issue #3324032 :
...
(I forgot to commit this before the MR2 branch was made.)
It is possible to create an app that cannot...
...be uninstalled using device policy managers
Don't allow app switches while we are bringing up the confirmation
dialog. This prevents the app from pushing us out of the intended
settings app flow.
Change-Id: Id670e231ac47346478d22a3f59bb4a44a68ef7b2
2011-03-04 17:34:13 -08:00
Jaikumar Ganesh
6ff8179731
Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1
2011-03-04 15:09:12 -08:00
Jaikumar Ganesh
6eb84ac6de
Settings app: Run Bluetooth Event receiver when not in fg.
...
Also fix connection indication issues.
Fixes bugs 3510336 and 3513352
Change-Id: Iaa47c9d7fd04fa5dd2700f55993ba2fd1a78fd70
2011-03-04 14:53:44 -08:00
Eric Fischer
c090623001
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-04 13:53:51 -08:00
Eric Fischer
bc2f61b2e3
Import revised translations. DO NOT MERGE
...
Change-Id: I76e25be51258b5f5f7ea1b919b1280c326741953
2011-03-04 13:47:23 -08:00
Daisuke Miyakawa
e0db177334
am 3a695a12
: (-s ours) Not receive tick event in datetime setup
...
* commit '3a695a124e5c64b1f7485e525c16f343aa22e7f0':
Not receive tick event in datetime setup
2011-03-04 11:17:19 -08:00
Jaikumar Ganesh
04bebd9800
Merge "Fix settings app not showing correct profile connection state message." into honeycomb-mr1
2011-03-04 11:06:39 -08:00
Jaikumar Ganesh
50e0b0cf87
Fix settings app not showing correct profile connection state message.
...
Bug:3385085
Change-Id: Ie4b7eb6bc9d8c91264cf7f68d7830c110e34496d
2011-03-04 10:27:31 -08:00
Daisuke Miyakawa
d85ce3c9ea
Put SSID field first.
...
Bug: 3508455
Change-Id: I1626562d235947cd662a3eb9579f93b6ebc6ab56
2011-03-03 20:08:09 -08:00
Daisuke Miyakawa
3a695a124e
Not receive tick event in datetime setup
...
DO NOT MERGE
Bug: 3510551
Change-Id: If3d7175fe90b8927099e804fa5fbb37c207fd529
2011-03-03 16:35:22 -08:00
Eric Fischer
e39213e225
Merge changes I33bf228d,I18d2329e into honeycomb-mr1
...
* changes:
Remove unneeded large-screen-specific translations.
Mark placeholders in format strings as placeholders.
2011-03-03 16:20:18 -08:00
Eric Fischer
a52f9d5666
Remove unneeded large-screen-specific translations.
...
Change-Id: I33bf228dfa58959db343da5d41be000a2ef58ab0
2011-03-03 15:50:37 -08:00
Eric Fischer
43d495987d
Mark placeholders in format strings as placeholders.
...
Bug: 3422176
Change-Id: I18d2329e72fa9a521c2349fea638e4435f737ca7
2011-03-03 15:17:05 -08:00
Irfan Sheriff
5640ccff74
Avoid dialog dismiss until IP and proxy is valid
...
Accepting an invalid configuration can lead to
unexpected behavior.
Validate all fields before dismissing dialog. A further
improvement to this can be highlighting the faulty field
to the user by a color change.
Bug: 3462049
Change-Id: I0d0a6eae1d62b16fbb822261c4536c4108a5866d
2011-03-03 15:04:23 -08:00
Irfan Sheriff
216a58c882
Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1
2011-03-03 15:02:05 -08:00
Irfan Sheriff
00615cf5dc
DO NOT MERGE Proxy and IP fixes
...
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields
Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
2011-03-03 15:01:07 -08:00
Eric Fischer
436e1d2e91
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-03 14:24:34 -08:00
Eric Fischer
e4c392be0e
Import revised translations. DO NOT MERGE
...
Change-Id: I4806cd78bd5fab24445c12755ef47e982dc2b3f2
2011-03-03 14:10:34 -08:00
Svetoslav Ganov
c82b60dcc7
Updated the strings for configuring long press timeout.
...
Change-Id: I1a4b2e05bf63933861198b8bcf7a34d0f4f6b1fd
2011-03-03 13:21:20 -08:00
Daisuke Miyakawa
d61737b560
am 96f05f90
: (-s ours) fix datetime setup problem. DO NOT MERGE
...
* commit '96f05f909e19a4fe7cee8f961344ef13a882e7e3':
fix datetime setup problem. DO NOT MERGE
2011-03-03 08:31:30 -08:00
Eric Fischer
98aec796ca
am 39f443ce
: (-s ours) am 0d9e74d4
: Import revised translations. DO NOT MERGE
...
* commit '39f443ce265a8a4e9565662aea341bbb74c4f4a1':
Import revised translations. DO NOT MERGE
2011-03-02 22:16:43 -08:00
Amith Yamasani
fb6f306a2b
am 665fc6aa
: am b7e393bf
: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb
...
* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
Bring back Wi-Fi sleep policy setting for wifi-only devices.
2011-03-02 22:16:41 -08:00
Mike Lockwood
1de75d44ac
am 71dcf4d2
: (-s ours) am 9d768735
: (-s ours) am 0552d336
: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
...
* commit '71dcf4d2c4de4cb38d287301a7bdca1643a7156d':
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
2011-03-02 22:11:01 -08:00
Amith Yamasani
e1e1e61d23
Merge "Fix the string for empty dictionary on the tablet."
2011-03-02 22:09:38 -08:00
Daisuke Miyakawa
96f05f909e
fix datetime setup problem. DO NOT MERGE
...
- remove bat if clause for xl
- use HOUR_OF_DAY instead of HOUR
Bug: 3487947
Change-Id: I532bdb72f62ecbc776411496dd96e72d9c16b997
2011-03-02 20:08:48 -08:00
Svetoslav Ganov
dded90c67e
Merge "Adding system wide long press timeout configurability under accessibility."
2011-03-02 19:17:30 -08:00
Amith Yamasani
26797fefdc
Fix the string for empty dictionary on the tablet.
...
Bug: 3335775
Change-Id: Iee7fbf6a25d61c761ea4cb125454c08a579b5a7e
2011-03-02 19:03:01 -08:00
Daisuke Miyakawa
027d610205
Merge "Notify "skip to caller."
2011-03-02 18:25:53 -08:00
Eric Fischer
39f443ce26
am 0d9e74d4
: Import revised translations. DO NOT MERGE
...
* commit '0d9e74d4d28585c920c16a350d301afb7004187b':
Import revised translations. DO NOT MERGE
2011-03-02 18:25:46 -08:00
Amith Yamasani
665fc6aadd
am b7e393bf
: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb
...
* commit 'b7e393bf9b0327833098d2181b0e7125af2181dc':
Bring back Wi-Fi sleep policy setting for wifi-only devices.
2011-03-02 18:25:11 -08:00
Daisuke Miyakawa
e0d9ed4a31
Merge "fix datetime setup problem"
2011-03-02 18:13:46 -08:00
Daisuke Miyakawa
a85bfd2552
fix datetime setup problem
...
- remove bat if clause for xl
- use HOUR_OF_DAY instead of HOUR
Bug: 3487947
Change-Id: I46a641c301bb3d375cd24692a12ebcc118ad348c
2011-03-02 18:00:40 -08:00
Vasu Nori
4602996430
Merge "bug:3321005 make Settings --> Storage screen display little less ugly"
2011-03-02 17:52:42 -08:00
Vasu Nori
340e85d1d0
bug:3321005 make Settings --> Storage screen display little less ugly
...
I have implemented most of what the UX designer proposed. except these
1. Percentage Bar chart left padding should be 16dip
2. Percentage Bar chart and Total Space preferences should be combined into
one singne ViewGroup or something. and "total Space" shoudl be aligned
on the right border
Change-Id: I9b238eaa561c9837b47b9955e7d718d92543ca34
2011-03-02 17:26:53 -08:00
Roy West
e66c689cfb
Fix bug 3368792.
...
Change-Id: Ibe978c5991847420254d3a724dcdc65da86ecf45
2011-03-02 17:24:20 -08:00
Mike Lockwood
71dcf4d2c4
am 9d768735
: (-s ours) am 0552d336
: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
...
* commit '9d76873546bb680d67a980dafd1b95de1b7c9f6c':
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
2011-03-02 17:24:10 -08:00
Roy West
803128272f
Fix bug 3399815.
...
Change-Id: Idd8648be435dd0488ff8cd31ee52a06ad04a5b85
2011-03-02 17:14:33 -08:00
Amith Yamasani
80c1e9ff0e
Merge "Move up wifi tethering settings one level."
2011-03-02 16:52:41 -08:00
Amith Yamasani
84a042c6e9
Move up wifi tethering settings one level.
...
Bug: 3249998
Remove an extra level of menu by moving the Configure Wi-Fi hotspot preference to the Tethering settings page.
Change-Id: I20b67ae1ddd7e9967c99ff6a8039799be792382f
2011-03-02 16:31:38 -08:00