PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141,854 Commits 1 Branch 0 Tags
80bec7adef9cdcf93dde7cc0aaa81f2534c12d5c
Commit Graph

141854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
f10da8fff5 am 06167cc3: am b0883cb3: Fix bugs in credential storage settings: 
Merge commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b'

* commit '06167cc39569fde2a9bdbff859ff5358f2f90a0b':
  Fix bugs in credential storage settings:
 2009-10-01 11:49:17 -07:00
Dianne Hackborn
986a88ab79 am 78651523: am cabb147c: Improve running services info. 
Merge commit '78651523727ee3aadec008faa7ae5a945c51ab69'

* commit '78651523727ee3aadec008faa7ae5a945c51ab69':
  Improve running services info.
 2009-10-01 11:44:45 -07:00
Jim Miller
1a9f1bd065 am 356ceb58: am be699645: Merge change I56544d0e into eclair 
Merge commit '356ceb5853243762d00d0c4e1482fbe887f66e3e'

* commit '356ceb5853243762d00d0c4e1482fbe887f66e3e':
  Fix for 2137900: Be more conservative about poking the wakelock
 2009-10-01 11:40:29 -07:00
Ken Shirriff
9bae0a3178 am f666279a: am eb8d6f78: Merge change Id80d1999 into eclair 
Merge commit 'f666279a60cd371c938955448453ccac2428b539'

* commit 'f666279a60cd371c938955448453ccac2428b539':
  Fix power widget brightness.
 2009-10-01 11:38:10 -07:00
Android (Google) Code Review
85ed086217 Merge change I454a0dbf into eclair 
* changes:
  SecuritySettings: revert "minor tuning".
 2009-10-01 14:35:13 -04:00
Chia-chi Yeh
454a0dbf8f SecuritySettings: revert "minor tuning". 2009-10-02 02:32:54 +08:00
Android (Google) Code Review
9767612cc8 Merge change If764d20a into eclair 
* changes:
  SecuritySettings: fix a the status before handling the intent.
 2009-10-01 14:17:26 -04:00
Amith Yamasani
b214576f47 am 75f25db9: am d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work 
Merge commit '75f25db90dd5465273cd23f27d2f5a1cd625aeb9'

* commit '75f25db90dd5465273cd23f27d2f5a1cd625aeb9':
  Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
 2009-10-01 11:16:58 -07:00
Chia-chi Yeh
f764d20a74 SecuritySettings: fix a the status before handling the intent. 2009-10-02 02:16:08 +08:00
Mike Cleron
3442d59157 am 31794fa9: am 69c51fea: New icons 
Merge commit '31794fa97992a7a17a108ac99247ae2c904b8509'

* commit '31794fa97992a7a17a108ac99247ae2c904b8509':
  New icons
 2009-10-01 11:12:20 -07:00
Android (Google) Code Review
e61a2403a6 Merge change I844d3db3 into eclair 
* changes:
  SecuritySettings: set the check box before further processing.
 2009-10-01 13:14:59 -04:00
Chia-chi Yeh
844d3db3fe SecuritySettings: set the check box before further processing. 2009-10-02 01:13:36 +08:00
Android (Google) Code Review
1e98dfb480 Merge change I446bf8b5 into eclair 
* changes:
  SecuritySettings: minor tuning.
 2009-10-01 13:12:21 -04:00
Chia-chi Yeh
446bf8b5bc SecuritySettings: minor tuning. 2009-10-02 01:11:17 +08:00
Android (Google) Code Review
b83ff4af8c Merge change Ibf07c83d into eclair 
* changes:
  SecuritySettings: remove debug messages.
 2009-10-01 13:04:25 -04:00
Chia-chi Yeh
bf07c83d92 SecuritySettings: remove debug messages. 2009-10-02 01:03:50 +08:00
Android (Google) Code Review
51e97b33d2 Merge change Ia7c57145 into eclair 
* changes:
  SecuritySettings: remove trailing spaces.
 2009-10-01 12:49:08 -04:00
Chia-chi Yeh
a7c5714599 SecuritySettings: remove trailing spaces. 2009-10-02 00:48:32 +08:00
Android (Google) Code Review
c49ca127aa Merge change I02f58e89 into eclair 
* changes:
  SecuritySettings: clean up.
 2009-10-01 12:47:24 -04:00
Android (Google) Code Review
d2fa30baee Merge change I28f1a0fc into eclair 
* changes:
  WifiSettings: use keystore namespace instead of blobl.
 2009-10-01 12:47:12 -04:00
Chia-chi Yeh
02f58e898d SecuritySettings: clean up. 2009-10-02 00:39:14 +08:00
android-build SharedAccount
3a0fc70b69 am 40906ea2: empty merge to avoid future conflicts 
Merge commit '40906ea24eceed5b06be2087d8e06738fc9cd876' into eclair-plus-aosp

* commit '40906ea24eceed5b06be2087d8e06738fc9cd876':
  b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
 2009-10-01 08:57:04 -07:00
android-build SharedAccount
40906ea24e empty merge to avoid future conflicts 
Merge branch 'eclair-release' into HEAD
 2009-10-01 08:46:43 -07:00
Michael Chan
93979854db am 7bf9e031: Merge change Ie7e8a7ef into eclair 
Merge commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp

* commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
  Don't auto-connect to OPP after pairing
 2009-10-01 07:54:39 -07:00
Android (Google) Code Review
7bf9e0317c Merge change Ie7e8a7ef into eclair 
* changes:
  Don't auto-connect to OPP after pairing
 2009-10-01 10:46:26 -04:00
Chia-chi Yeh
28f1a0fc5b WifiSettings: use keystore namespace instead of blobl. 2009-10-01 19:17:55 +08:00
Michael Chan
b547dda338 Don't auto-connect to OPP after pairing 
Change-Id: Ie7e8a7ef7188f7ffa6b32595764c100a0d72be89
 2009-09-30 23:08:19 -07:00
Amith Yamasani
7c8a08d513 am ee52bed5: Merge change I39527366 into eclair 
Merge commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp

* commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b':
  Use a custom system icon for native processes.
 2009-09-30 21:15:52 -07:00
Mike Cleron
d6372e995c am c5648906: Merge change I00ab9f0b into eclair 
Merge commit 'c564890637bf91e92ede27789e4d98863c46e681' into eclair-plus-aosp

* commit 'c564890637bf91e92ede27789e4d98863c46e681':
  Fix widgets
 2009-09-30 21:15:36 -07:00
Michael Chan
f30ebb8bc8 am e6531e25: b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..." 
Merge commit 'e6531e253bf646324d3a68de0e9cc612c5e1c8ac' into eclair-plus-aosp

* commit 'e6531e253bf646324d3a68de0e9cc612c5e1c8ac':
  b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..."
 2009-09-30 21:14:24 -07:00
Android (Google) Code Review
ee52bed514 Merge change I39527366 into eclair 
* changes:
  Use a custom system icon for native processes.
 2009-09-30 21:43:48 -04:00
Amith Yamasani
395273662c Use a custom system icon for native processes. 
New icons for system components in Battery Use screen.
 2009-09-30 18:42:29 -07:00
Android (Google) Code Review
c564890637 Merge change I00ab9f0b into eclair 
* changes:
  Fix widgets
 2009-09-30 21:34:36 -04:00
Mike Cleron
00ab9f0b51 Fix widgets 2009-09-30 18:29:25 -07:00
Michael Chan
e6531e253b b/2154978 Show only connectable profiles (Headset and& A2DP but not OPP) in Bluetooth Device Advance Options aka "Connect to..." 
Change-Id: I34249a4828707bde491da4a82dca94ecf37cf490
 2009-09-30 17:43:12 -07:00
Michael Chan
fa44848b0d b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs 
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid

Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
 2009-09-30 15:26:18 -07:00
Amith Yamasani
962d3f4ab7 am e5cff265: Merge change Ibe023c8a into eclair 
Merge commit 'e5cff2655cd60226646820638e2dab54a4af5e9a' into eclair-plus-aosp

* commit 'e5cff2655cd60226646820638e2dab54a4af5e9a':
  Fix Safety Settings screen bugs - 2150942, 2151440, 2151727
 2009-09-30 15:12:56 -07:00
Android (Google) Code Review
e5cff2655c Merge change Ibe023c8a into eclair 
* changes:
  Fix Safety Settings screen bugs - 2150942, 2151440, 2151727
 2009-09-30 18:05:03 -04:00
Jaikumar Ganesh
8c5ff4b76a am 1eb1df08: Add strings for authentication type. 
Merge commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp

* commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab':
  Add strings for authentication type.
 2009-09-30 14:15:29 -07:00
Jaikumar Ganesh
1eb1df082d Add strings for authentication type. 
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.

Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
 2009-09-30 13:40:11 -07:00
Amith Yamasani
be023c8a75 Fix Safety Settings screen bugs - 2150942, 2151440, 2151727 
Handle the back key.
Finish the activity if dialog is cancelled.
Show an error and finish the activity if URL couldn't be found due to
connectivity problem and not just when Telephony is not available.
 2009-09-30 13:13:44 -07:00
Michael Chan
eedf612f83 am e3b59f19: Merge change I5eab1270 into eclair 
Merge commit 'e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8' into eclair-plus-aosp

* commit 'e3b59f193e0df1a2643c367f7f1f4f7b6817a5f8':
  b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
 2009-09-30 12:44:42 -07:00
Android (Google) Code Review
e3b59f193e Merge change I5eab1270 into eclair 
* changes:
  b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs
 2009-09-30 15:39:06 -04:00
Michael Chan
eaf13a2c15 b/2154576 Fixed the problem were some BT profiles were not connected when first UUID notification of many didn't have all the UUIDs 
Reset connect timer event if profile was non-empty.
Clear profiles after unpair
mConnectAttemptedWithoutUuid

Change-Id: I5eab1270a755c6c87eb5be13a2f43dbbcd9a2f88
 2009-09-30 12:34:32 -07:00
Debajit Ghosh
a6ddefe68f am 99716fb4: updating sync settings icon 
Merge commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba' into eclair-plus-aosp

* commit '99716fb4b4b0b3ca411dd8e699f5bc34a9c8b1ba':
  updating sync settings icon
 2009-09-30 11:43:48 -07:00
Debajit Ghosh
99716fb4b4 updating sync settings icon 2009-09-30 11:01:26 -07:00
Hung-ying Tyan
39087f8a69 am 8fd062e1: Use the new VpnType.getDescriptionId(). 
Merge commit '8fd062e1a5c0047deff1dd817a097b94891000f2' into eclair-plus-aosp

* commit '8fd062e1a5c0047deff1dd817a097b94891000f2':
  Use the new VpnType.getDescriptionId().
 2009-09-30 03:06:58 -07:00
Hung-ying Tyan
8fd062e1a5 Use the new VpnType.getDescriptionId(). 2009-09-30 17:57:56 +08:00
Mike Cleron
9c06c4b2df am 08df1488: Newer icons 
Merge commit '08df148848eb72d16564264f02b5424c8203c746' into eclair-plus-aosp

* commit '08df148848eb72d16564264f02b5424c8203c746':
  Newer icons
 2009-09-30 01:36:04 -07:00
Mike Cleron
08df148848 Newer icons 2009-09-30 01:18:17 -07:00