Amith Yamasani
cb6a9bc307
am cb84ad52
: am 1ad4824d
: am 35bc6b5f
: Wifi disconnect policy summary text should not contain "mobile data".
...
* commit 'cb84ad529d802e60931d94b68912ee85c9758952':
Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 18:39:59 -08:00
Jaikumar Ganesh
37bf3353d1
Return profile state disconnected when not yet bound to service.
...
Bug: 4007080
There is a another bug open to handle service object being null
and a connect / disconnect call being made.
Change-Id: I30f6923323532b5756338b350ec4ce0e1a31d1ff
2011-03-08 18:04:25 -08:00
Dianne Hackborn
314dfa7a44
am 18859947
: Merge "Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1
...
* commit '18859947ea2899197e1621e154aab6bceb14d406':
Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped
2011-03-08 14:53:03 -08:00
Dianne Hackborn
18859947ea
Merge "Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1
2011-03-08 14:51:03 -08:00
Dianne Hackborn
c442e52dca
Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped
...
There should probably be a broadcast from PM about this. Later.
Change-Id: I713197ed458f8f6a914efb3800cd1b192f741613
2011-03-08 14:40:25 -08:00
Amith Yamasani
cb84ad529d
am 1ad4824d
: am 35bc6b5f
: Wifi disconnect policy summary text should not contain "mobile data".
...
* commit '1ad4824d848d67e185f06b4fdce86f1caeb0d95e':
Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 13:51:52 -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
b6ad06118a
am 0da4ec49
: am f8a3a17c
: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1
...
* commit '0da4ec49813cbad4b27acc7ec56cbfba3a741b76':
Don't check states when mActiveProfile is present
2011-03-08 07:55:29 -08:00
Hung-ying Tyan
0da4ec4981
am f8a3a17c
: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1
...
* commit 'f8a3a17c1e8cb71342b63cc08388883dedeb3180':
Don't check states when mActiveProfile is present
2011-03-08 07:38:55 -08:00
Daisuke Miyakawa
6a7b3d9949
Handle "scanning" status correctly
...
Bug: 4026282
Change-Id: I7dc113122a8611095642e1a70334d7cdc165173f
2011-03-07 16:29:50 -08:00
Daisuke Miyakawa
ffce5dabbb
Show "disconnected" progress bar on add network flow
...
Change-Id: I4dc2df9016f21f655a13c244b744020de4a12d0b
2011-03-07 16:07:02 -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
b26cca371c
am 3f1d3919
: Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1
...
* commit '3f1d39193ed6bb0a7553555ac0ebeafed75f03af':
Cherry-pick from master: Fix issue #3324032 :
2011-03-04 18:30: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
Dianne Hackborn
6bb14c7be7
Merge "Add font size preference."
2011-03-04 17:33:19 -08:00
Dianne Hackborn
6677e56f45
Add font size preference.
...
Shamelessly stolen from SpareParts.
Change-Id: I5bcdc5c738a0b2af7e7bd8dae303997c28298086
2011-03-04 17:30:54 -08:00
Dianne Hackborn
975ba224b7
Merge "Fix issue #3324032 : It is possible to create an app that cannot..."
2011-03-04 17:30:28 -08:00
Jaikumar Ganesh
1bd39f4b30
am 18de874e
: am 6ff81797
: Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1
...
* commit '18de874e9d4d5cf4df0467687e683704399d7689':
Settings app: Run Bluetooth Event receiver when not in fg.
2011-03-04 17:14:55 -08:00
Ed Heyl
7054dc4c03
am 45170dd6
: Merge "resolved conflicts for merge of a4fb8c86
to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '45170dd6bbc2106a837a6f39a6bf6455ea36d9cf':
Support configuring the protocol in APN settings.
2011-03-04 17:11:18 -08:00
Jaikumar Ganesh
18de874e9d
am 6ff81797
: Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1
...
* commit '6ff8179731043b04a2c5020ca964563c9510b697':
Settings app: Run Bluetooth Event receiver when not in fg.
2011-03-04 16:45:39 -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
Lorenzo Colitti
67c70267d1
resolved conflicts for merge of a4fb8c86
to honeycomb-plus-aosp
...
Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
2011-03-04 14:49:40 -08:00
Daisuke Miyakawa
f26b2b5110
Fix padding problem around progress bar
...
Change-Id: I3f76b4f01ed433e68a839f02c2c1840c60749ef1
2011-03-04 13:08:44 -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
Lorenzo Colitti
a4fb8c8684
am f4393101
: Merge "Support configuring the protocol in APN settings." into gingerbread
...
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
Support configuring the protocol in APN settings.
2011-03-03 17:07:39 -08:00
Lorenzo Colitti
f4393101f8
Merge "Support configuring the protocol in APN settings." into gingerbread
2011-03-03 17:03:45 -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
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
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
Dianne Hackborn
4f25e1d5e3
Fix issue #3324032 : 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: Iea1ff64c054452d307f91f349a815c0b244e9af5
2011-03-02 22:39:49 -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
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
Daisuke Miyakawa
027d610205
Merge "Notify "skip to caller."
2011-03-02 18:25:53 -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
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
Jean-Michel Trivi
9a777a8513
Merge "Fix bug 3421125 Use default TTS rate for demo in Settings"
2011-03-02 16:08:44 -08:00
Daisuke Miyakawa
83183f4698
Notify "skip to caller.
...
Bug: 3504698
Change-Id: Ifb39830ff15943a3ef1a0130a8620049fe481ff9
2011-03-02 15:56:45 -08:00
Jean-Michel Trivi
8863ce9f4d
Fix bug 3421125 Use default TTS rate for demo in Settings
...
When initializing the TTS engine, the default speech rate is
correctly read, but the TTS demonstration in the Settings
screen was overriding that value by setting the rate to
its fixed default value after the engine was initialized.
The fix consists in applying the default value after it has
been read from the settings (as is done for the language
for instance).
Change-Id: Ie13dfa3a2a7e59e5e120e74dc41e60afbedea821
2011-03-02 15:47:52 -08:00
Mike Lockwood
9d76873546
am 0552d336
: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
...
* commit '0552d3366487b27c619c055a04c81b8af0b84d33':
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
2011-03-02 15:38:51 -08:00
Svetoslav Ganov
82623019d2
Adding system wide long press timeout configurability under accessibility.
...
bug:3505096
Added an option in the accessibility set
Change-Id: Ie36240229ca15a252d5f34051bfe8ac77a101da9
2011-03-02 14:02:23 -08:00
Daisuke Miyakawa
6291d50b5d
Shrink screen correctly on authentication failure
...
Bug: 3505089
Change-Id: Ibbd54c6afb0d349fb446775af93412e7557df3c5
2011-03-02 13:48:45 -08:00
Daisuke Miyakawa
d1c22a1b56
Show more graceful screens for "add network" flow
...
- use TableLayout instead of RelativeLayout for
wifi configuration to align each columns appropriately.
- split @id/type field into two fields in SetupWizard
Bug: 3403168
Change-Id: I37f2c60ce1b0473af7d20dee1775e9893d2abade
2011-03-02 13:05:14 -08:00