PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags
783be0a24f328d7e781b5765b7688c55fb24c89c
Commit Graph

3828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
c777ee29c8 Improve Bluetooth tethering UI usability. 
- Updated hint text for BT tethering checkbox to
  "[Sharing|not sharing] this [tablet|phone]'s mobile data connection".
- Show correct hint text when user enters tethering screen.
- Show correct status after user enables tethering when Bluetooth is off.
  When BluetoothPan.setBluetoothTethering(true) is called with BT off,
  BluetoothPanProfileHandler will add a broadcast receiver to enable
  tethering after BT turns on. This happens too late to show the correct
  status when TetherSettings gets the adapter state changed event, so set
  a flag (mBluetoothEnableForTether) instead, and call setBluetoothTethering
  ourselves after the state changes to ON. Also, clear the flag if the
  adapter state changes to OFF or ERROR.
- Show correct status when user enables tethering, then disables Bluetooth,
  then returns to the tethering screen. Previously it would show
  Bluetooth tethering enabled, even though adapter state was OFF.
- Show the number of connected devices in tethering preference screen.
- Distinguish between PANU and NAP in device profiles screen, and show
  appropriate text to clarify the direction of tethering.
- Remove profiles from device profiles list when the device removes the UUID
  (e.g. Mac OS X turning NAP on/off) and after a NAP disconnection when the
  remote device only supports PANU.

Bug: 3414575
Change-Id: I2c0830876d5b9bddb293e57c4d3ca74f105911b8
 2011-03-09 14:56:56 -08:00
Mike Lockwood
025247c768 am 788062fe: am 2715376c: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit '788062fe82b1f9b51a7670da6400ebabf54da4ca':
  IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-09 10:49:02 -08:00
Mike Lockwood
788062fe82 am 2715376c: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit '2715376cfa4d220f183623a5f35214d1bd537376':
  IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-09 10:46:11 -08:00
Mike Lockwood
2715376cfa IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
Change-Id: If661a17646e2698e92cfdfb1a3d0e5dd42e06279
BUG: 4061035

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-09 12:10:41 -05:00
Jaikumar Ganesh
fabb187c22 am 4d2d004b: am 46a2941b: Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1 
* commit '4d2d004b7239cc29e1d8e6c02b483ff781c19f9a':
  Return profile state disconnected when not yet bound to service.
 2011-03-08 23:53:37 -08:00
Jaikumar Ganesh
4d2d004b72 am 46a2941b: Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1 
* commit '46a2941b3f2e5c38388f3e503a22768ca2d9814a':
  Return profile state disconnected when not yet bound to service.
 2011-03-08 19:41:50 -08:00
Jaikumar Ganesh
46a2941b3f Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1 2011-03-08 19:40:12 -08:00
Eric Fischer
1e791b47eb am 7d549c10: (-s ours) am 4652c45e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '7d549c10b499ecfd5ad44d22953729020cb4297d':
  Import revised translations.  DO NOT MERGE
 2011-03-08 18:42:30 -08:00
Dianne Hackborn
b168e97847 am 314dfa7a: am 18859947: Merge "Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped" into honeycomb-mr1 
* commit '314dfa7a440b690a1b400f81a21ab60abb6b1fbb':
  Fix issue #4021524 HMI63B: "Force stop" button not disabled after app is stopped
 2011-03-08 18:41:04 -08:00
Justin Ho
7002bf0f91 am 346c8a1f: am 6adc2ee8: Merge "Updated storage display colors in Settings" into honeycomb-mr1 
* commit '346c8a1f0e86e805770f5d09f41ff9220192fdb3':
  Updated storage display colors in Settings
 2011-03-08 18:40:20 -08:00
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
Eric Fischer
7d549c10b4 am 4652c45e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '4652c45e6b8ddf4e335a478e823052696b82011e':
  Import revised translations.  DO NOT MERGE
 2011-03-08 15:55:20 -08:00
Eric Fischer
4652c45e6b Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-08 15:52:49 -08:00
Eric Fischer
f819668bf4 Import revised translations. DO NOT MERGE 
Change-Id: Iec33108aec25759701f47de6fa95d8d9657ff95e
 2011-03-08 15:43:10 -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
Justin Ho
346c8a1f0e am 6adc2ee8: Merge "Updated storage display colors in Settings" into honeycomb-mr1 
* commit '6adc2ee87fd19a2f3d03896b1054facd8a3e8788':
  Updated storage display colors in Settings
 2011-03-08 14:13:36 -08:00
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
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
Hung-ying Tyan
f8a3a17c1e Merge "Don't check states when mActiveProfile is present" into honeycomb-mr1 2011-03-08 07:24:13 -08:00
Daisuke Miyakawa
6eb9979910 Use consistent indent 
Not all indents but just relevant ones are fixed.

Change-Id: I042f3f70b4ede1e4cc90136b99005d4c4d455de9
 2011-03-07 19:26:06 -08:00
Daisuke Miyakawa
0c0249b0ea Merge "Handle "scanning" status correctly" 2011-03-07 19:21:22 -08:00
Daisuke Miyakawa
f82efaedce Fix layout for wifi setup xl 
- use 56dip instead of 48dip for TableRow's height
- enclose some Views to accomodate them well
  in TableRow
- use center_vertical instead of bottom to show
  TextView. Bottom texts looks weird with wider height.

Change-Id: I9c544cb4f2532e8ceb84a746fc22223ca1dce58c
 2011-03-07 17:58:01 -08:00
Daisuke Miyakawa
6a7b3d9949 Handle "scanning" status correctly 
Bug: 4026282
Change-Id: I7dc113122a8611095642e1a70334d7cdc165173f
 2011-03-07 16:29:50 -08:00
Daisuke Miyakawa
4eb13d06b6 Merge "Show "disconnected" progress bar on add network flow" 2011-03-07 16:07:43 -08:00
Daisuke Miyakawa
ffce5dabbb Show "disconnected" progress bar on add network flow 
Change-Id: I4dc2df9016f21f655a13c244b744020de4a12d0b
 2011-03-07 16:07:02 -08:00
Eric Fischer
f3b5a4620a am bada0585: (-s ours) am 0e1acd4d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'bada05855b26e9e9309460d22e2a48177ecaacd9':
  Import revised translations.  DO NOT MERGE
 2011-03-07 13:24:39 -08:00
Eric Fischer
bada05855b am 0e1acd4d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '0e1acd4d19f3809acc446b761b74d12f2a88ecfc':
  Import revised translations.  DO NOT MERGE
 2011-03-07 13:11:50 -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
da407be453 am 4943af9f: am 71dee16b: Merge "bug:3514023 fix strings" into honeycomb-mr1 
* commit '4943af9f71f0dc273c05de0d67dc23495748c5c1':
  bug:3514023 fix strings
 2011-03-07 11:49:53 -08:00
Vasu Nori
4943af9f71 am 71dee16b: Merge "bug:3514023 fix strings" into honeycomb-mr1 
* commit '71dee16bc9683d1dd768c852e12911c72e471544':
  bug:3514023 fix strings
 2011-03-07 11:46:45 -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
d4a39fce6b am b26cca37: am 3f1d3919: Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1 
* commit 'b26cca371c5040ec33b3e3de11914ca9fbc7b933':
  Cherry-pick from master:  Fix issue #3324032:
 2011-03-04 18:32:59 -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