PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,707 Commits 1 Branch 0 Tags
6a01acdeaf24e94a8f6a1399e8a6d351da26c07c
Commit Graph

3707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
175884f388 am d205bfe3: (-s ours) am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit 'd205bfe361c1de857e8013d6acd36f3f831eb979':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 17:53:45 -07:00
Mike Lockwood
d205bfe361 am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter 
* commit '61487da6ace3c83c71b164edd307a6ea87f9ff0c':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
 2011-03-14 17:48:59 -07:00
Eric Fischer
78391ae77f am e88b157a: (-s ours) am 7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'e88b157a8289802d2b862ae3f0e0adad04921a98':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:18:37 -07:00
Eric Fischer
e88b157a82 am 7d3d72ba: (-s ours) Import revised translations. DO NOT MERGE 
* commit '7d3d72ba46a33f2b0ea3da880986858663535ed1':
  Import revised translations.  DO NOT MERGE
 2011-03-14 14:28:55 -07:00
Eric Fischer
7d3d72ba46 Import revised translations. DO NOT MERGE 
Change-Id: Ifbdca414f22a58d1828780183518c0214f0ce0f6
 2011-03-14 14:07:45 -07: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
Irfan Sheriff
f5fe437842 Merge "Fix numeric strings to not be translated" 2011-03-11 17:31:05 -08: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
Irfan Sheriff
6c7cd3bcba Fix numeric strings to not be translated 
Bug: 4086518
Change-Id: Id6cc83cfcdaea6d9658dd6cc59f94ee6a34662d6
 2011-03-11 15:42:09 -08: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
Eric Fischer
04d9894827 am 33c5915c: (-s ours) am 91d0b304: Import revised translations. DO NOT MERGE 
* commit '33c5915cb6a02c0dad294d3055cdfb78a8b64244':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:49:18 -08:00
Eric Fischer
33c5915cb6 am 91d0b304: Import revised translations. DO NOT MERGE 
* commit '91d0b3046171117164c9400f9f45f12d4c0a69c7':
  Import revised translations.  DO NOT MERGE
 2011-03-10 14:47:54 -08:00
Eric Fischer
91d0b30461 Import revised translations. DO NOT MERGE 
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
 2011-03-10 14:26:33 -08:00
Eric Fischer
89b87f828a am 52d769a7: (-s ours) am 5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '52d769a7c30ee9bb884436a1ced0ef5c71812f70':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:53:55 -08:00
Eric Fischer
52d769a7c3 am 5ce140c1: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '5ce140c13520e3adca370b3474ebf0c83c097bd1':
  Import revised translations.  DO NOT MERGE
 2011-03-10 13:46:21 -08:00
Eric Fischer
5ce140c135 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-10 11:40:28 -08:00
Eric Fischer
0198a30b6f Import revised translations. DO NOT MERGE 
Change-Id: I3e2bd58983b329ea0e200f138a5d861e16ce6400
 2011-03-10 11:27:50 -08:00
TK MUN
b098f5d6bd am 63cc3b92: (-s ours) am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu 
* commit '63cc3b92f98758116613a5984ecd4aa65d050bbe':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:17:01 -08:00
TK MUN
63cc3b92f9 am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu 
* commit 'f018bd8cf3c27cf6ee8dc41c673e9d91b005c8a3':
  DO NOT MERGE WiMAX settings menu
 2011-03-09 23:14:51 -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
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