PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,235 Commits 1 Branch 0 Tags
ac48d0281f723b33968c5c0b0b4db99da38c5e12
Commit Graph

2073 Commits

Author SHA1 Message Date
Dianne Hackborn
b7258186de Fix to launch sub-preference activities. 
Change-Id: Ie7b5a6737b30159467d5ff5786b22107d73daedc
 2011-03-15 16:23:55 -07:00
Amith Yamasani
f502eaba0a Flip the icon states for Bluetooth profile auto-connect settings 
Bug: 4109035
Change-Id: Idb37a583957eeb8ea4c0b804e7933fd8e9af98e3
 2011-03-15 15:14:48 -07:00
Jason parks
eeaa242a34 am 0b9c7ed1: am 8693ba5c: am e481eaf9: Remove logging of the password. 
* commit '0b9c7ed10fdc0fd7e697e737404b5c00f9d35666':
  Remove logging of the password.
 2011-03-15 13:49:24 -07:00
Jason parks
8693ba5cdc am e481eaf9: Remove logging of the password. 
* commit 'e481eaf9618c435ea340a8312ecf8ca8093c7a76':
  Remove logging of the password.
 2011-03-15 13:44:47 -07:00
Jason parks
e481eaf961 Remove logging of the password. 
Change-Id: I2b3595089be8fc1d8c197dfa1ef8783c9dd2cf40
 2011-03-15 15:24:16 -05:00
Mike Lockwood
61487da6ac am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit 'e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 13:34:57 -07:00
Mike Lockwood
e6c7e45fdb DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
Bug: 4061035

Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 19:19:27 -05:00
Amith Yamasani
be606d6d0e Fix possible NPE when Screen settings is launched quickly in succession. 
Bug: 3368440
Change-Id: Icbcd0474978e20a055ec27f5960e9a4b98f4a68a
 2011-03-11 13:55:29 -08:00
Daisuke Miyakawa
d4fa73f877 Stop using Switch. 
Bug: 4082929
Change-Id: Idcf8f891e9e3257ed7b0a2727fe11fe540c8a141
 2011-03-11 12:14:48 -08:00
TK MUN
f018bd8cf3 am 36469186: DO NOT MERGE WiMAX settings menu 
* commit '36469186b7459d13688a2ca1c2316dbf172794dd':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:11:59 -08:00
TK MUN
36469186b7 DO NOT MERGE WiMAX settings menu 
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099
Signed-off-by: TK MUN <tk.mun@samsung.com>
 2011-03-09 23:02:21 -08:00
Jake Hamby
9fbaf432bd am 90222cf6: am f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 
* commit '90222cf6a8adbd5ae5be74c91a13a63f183a001e':
  Improve Bluetooth tethering UI usability.
 2011-03-09 19:47:44 -08:00
Jake Hamby
90222cf6a8 am f3448d1b: Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 
* commit 'f3448d1bfda817ccb28996d3dcf5cf8791ece6ce':
  Improve Bluetooth tethering UI usability.
 2011-03-09 19:45:54 -08:00
Jake Hamby
f3448d1bfd Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 2011-03-09 19:43:38 -08:00
Jim Miller
5451db4c4e am 615e0576: am e924ecb6: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1 
* commit '615e05761c8ad30cfc5f827c020d6c5a79ed5c01':
  Fix 3510307: Hide PIN passwords in ConfirmLockPassword
 2011-03-09 15:49:23 -08:00
Jim Miller
615e05761c am e924ecb6: Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1 
* commit 'e924ecb6114b24d326e8a9c5f4a12179e7f5c5c2':
  Fix 3510307: Hide PIN passwords in ConfirmLockPassword
 2011-03-09 15:46:18 -08:00
Jim Miller
e924ecb611 Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1 2011-03-09 15:44:23 -08:00
Jim Miller
025269df25 Fix 3510307: Hide PIN passwords in ConfirmLockPassword 
Change-Id: I9389cc37f013fe027df7a0eb0035fc0db8678792
 2011-03-09 14:59:10 -08:00
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
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
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