PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,584 Commits 1 Branch 0 Tags
75e17aa8cc4ca56d0d78f0f3f34f409d3e261d52
Commit Graph

3584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasu Nori
75e17aa8cc bug:3514023 fix string formatting 
Change-Id: I1d07e94f3693db09b29c621c5afae1cbaae24674
 2011-03-15 14:44:50 -07:00
Eric Fischer
91d0b30461 Import revised translations. DO NOT MERGE 
Change-Id: I2f3eb8d6b9e3e8c06dbaaa372050b6688b9c0e2b
 2011-03-10 14:26:33 -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
Jake Hamby
f3448d1bfd Merge "Improve Bluetooth tethering UI usability." into honeycomb-mr1 2011-03-09 19:43:38 -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
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
46a2941b3f Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1 2011-03-08 19:40:12 -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
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
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
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