PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,786 Commits 1 Branch 0 Tags
79c253e260f52bed93cbb79c60de1f7b6724ef1c
Commit Graph

116786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chouting Zhang
5ee0635923 Remove 'SIM Card Lock' from Security & Location settings for CDMA phones. 2009-08-04 10:20:32 -07:00
Jean-Baptiste Queru
caf7d199e8 merge from open-source master 2009-08-04 09:00:29 -07:00
Jean-Baptiste Queru
2877e184f3 merge from donut 2009-08-03 07:45:47 -07:00
Hung-ying Tyan
6fa32246b2 am 09cda9cf: Add VPN connection lost dialog. 
Merge commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e'

* commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e':
  Add VPN connection lost dialog.
 2009-08-03 01:37:54 -07:00
Hung-ying Tyan
09cda9cfaf Add VPN connection lost dialog. 2009-08-03 16:26:47 +08:00
Hung-ying Tyan
f8db1041f5 am 233991a2: Reduce the number of keystore connections to 1 
Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975'

* commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975':
  Reduce the number of keystore connections to 1
 2009-08-02 18:42:37 -07:00
Hung-ying Tyan
233991a242 Reduce the number of keystore connections to 1 
at entering the security settings.
 2009-08-02 20:28:54 +08:00
Android (Google) Code Review
12fb9066a3 am 38322393: Merge change 9437 into donut 
Merge commit '38322393a6d029349ef4ef4f80757da175029bcb'

* commit '38322393a6d029349ef4ef4f80757da175029bcb':
  Reduce the number of keystore connections.
 2009-07-31 20:18:10 -07:00
Android (Google) Code Review
38322393a6 Merge change 9437 into donut 
* changes:
  Reduce the number of keystore connections.
 2009-07-31 20:15:37 -07:00
Hung-ying Tyan
79f9fa073c Reduce the number of keystore connections. 2009-08-01 10:08:03 +08:00
Jim Miller
b6f1080058 Change resource string to "Accounts & Synchronization" 2009-07-31 18:00:06 -07:00
Amith Yamasani
498d90474b Add an icon to the left of the settings at the top level. 
Add a new attribute for the icon.
Add place holder icons.
 2009-07-31 07:24:08 -07:00
John Wang
4c47009172 am ed47f1e4: Fix the NullPointerException in Status Info. 
Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
  Fix the NullPointerException in Status Info.
 2009-07-30 18:58:55 -07:00
John Wang
ed47f1e497 Fix the NullPointerException in Status Info. 
Fix bug 1964037 Phone states activity fail. It only happens in Zaku build. Zaku build overlay the device_info_status.xml under vendor/docomo and don't have CDMA related preference. Status.java will hit the NullPointerException when trying to remove the non-exist preferences.

	modified:   src/com/android/settings/deviceinfo/Status.java
 2009-07-30 18:50:36 -07:00
Android (Google) Code Review
d20e072357 Merge change 9246 
* changes:
  2005382 Disable long press on Bluetooth device when BT is off 1930418 Grey BT device when BT is off
 2009-07-30 17:39:35 -07:00
Michael Chan
487843886d 2005382 Disable long press on Bluetooth device when BT is off 
1930418 Grey BT device when BT is off
 2009-07-30 16:35:44 -07:00
Android (Google) Code Review
9cfa368480 am 9c432349: Merge change 9142 into donut 
Merge commit '9c432349a79cd0f19ebdee18deb2b0b8550d661f'

* commit '9c432349a79cd0f19ebdee18deb2b0b8550d661f':
  Add encryption option to PPTP UI.
 2009-07-30 16:05:21 -07:00
Chung-yih Wang
844bb946af am c538b651: Fix some UI flow issues when the keystore is locked in WiFi setting. 
Merge commit 'c538b651a23287ab25584995c6c4b7a68ece027c'

* commit 'c538b651a23287ab25584995c6c4b7a68ece027c':
  Fix some UI flow issues when the keystore is locked in WiFi setting.
 2009-07-30 16:05:19 -07:00
Amith Yamasani
5f1d3351cc am 03f46bf4: Remove link to Contributors. Fix for #2022496 
Merge commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb'

* commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb':
  Remove link to Contributors. Fix for #2022496
 2009-07-30 16:05:18 -07:00
Android (Google) Code Review
a4fe66fdc7 am 79748b42: Merge change 9000 into donut 
Merge commit '79748b42e3e891c0d1541753c133fa83638146ce'

* commit '79748b42e3e891c0d1541753c133fa83638146ce':
  Fix duplicate entries being added when application is in active use
 2009-07-30 09:56:29 -07:00
Android (Google) Code Review
3deea37da3 Merge change 9116 
* changes:
  Allow enabling Wifi when in airplane mode.
 2009-07-30 08:35:41 -07:00
Jean-Michel Trivi
4867faafa1 am 387dc0ca: Fix bug 2017664. Use the new constant names in TextToSpeech. 
Merge commit '387dc0ca9c990511a71bd71c77d34ee33bc3f1aa'

* commit '387dc0ca9c990511a71bd71c77d34ee33bc3f1aa':
  Fix bug 2017664.
 2009-07-30 06:56:28 -07:00
Android (Google) Code Review
9c432349a7 Merge change 9142 into donut 
* changes:
  Add encryption option to PPTP UI.
 2009-07-30 05:23:06 -07:00
Chung-yih Wang
c538b651a2 Fix some UI flow issues when the keystore is locked in WiFi setting. 
To make it more user friendly, we need to continue on what
users intend to do after unlocking the credential storage.
 2009-07-30 20:03:16 +08:00
Hung-ying Tyan
7be218e7f7 Add encryption option to PPTP UI. 
Also add new error dialogs for L2TP challenge error and remote server
hanging up error.
 2009-07-30 19:54:13 +08:00
Mike Lockwood
83bcc98af1 Allow enabling Wifi when in airplane mode. 
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

We also allow access to the VPN settings under the same circumstances.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-07-29 23:53:44 -07:00
Amith Yamasani
03f46bf48e Remove link to Contributors. Fix for #2022496 2009-07-29 21:03:54 -07:00
Hung-ying Tyan
a7aaffa8ac am c157aadf: Add error dialog when secrets are missing. 
Merge commit 'c157aadf5682e417ace8e4cf3fba498e6953cad3'

* commit 'c157aadf5682e417ace8e4cf3fba498e6953cad3':
  Add error dialog when secrets are missing.
 2009-07-29 16:45:25 -07:00
Android (Google) Code Review
79748b42e3 Merge change 9000 into donut 
* changes:
  Fix duplicate entries being added when application is in active use
 2009-07-29 15:48:15 -07:00
Jean-Baptiste Queru
5f16c148da merge from donut 2009-07-29 14:57:07 -07:00
Suchi Amalapurapu
489eaccb98 Fix duplicate entries being added when application is in active use 2009-07-29 11:38:17 -07:00
Jean-Michel Trivi
387dc0ca9c Fix bug 2017664. 
Use the new constant names in TextToSpeech.
 2009-07-29 11:24:25 -07:00
Hung-ying Tyan
c157aadf56 Add error dialog when secrets are missing. 2009-07-29 15:08:50 +08:00
Android (Google) Code Review
f0484951fb Merge change 8847 
* changes:
  Wifi: Fix crash when changing screen orientation in Regulatory Domain list.
 2009-07-28 13:17:39 -07:00
Mike Lockwood
dab705adba Wifi: Fix crash when changing screen orientation in Regulatory Domain list. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-07-28 13:15:50 -07:00
Suchi Amalapurapu
eaf6cb159e am c0932631: Remove debug statement 
Merge commit 'c09326318334904f65d63c485c6fa1a7cb146bd8'

* commit 'c09326318334904f65d63c485c6fa1a7cb146bd8':
  Remove debug statement
 2009-07-28 11:29:09 -07:00
Suchi Amalapurapu
c093263183 Remove debug statement 2009-07-28 10:28:23 -07:00
Hung-ying Tyan
ceeb4e0d25 am 6120ddd7: Capitalize the first letter of a VPN name. 
Merge commit '6120ddd7863d1240a535bc111b62e068c8736058'

* commit '6120ddd7863d1240a535bc111b62e068c8736058':
  Capitalize the first letter of a VPN name.
 2009-07-26 21:47:35 -07:00
Hung-ying Tyan
c6b56e653e am 38a9daff: Fix secret EditText display and other fixes. 
Merge commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c'

* commit '38a9daffa5d3c5cd478bf5a81334cdbc02d4727c':
  Fix secret EditText display and other fixes.
 2009-07-26 21:46:17 -07:00
Jean-Baptiste Queru
6c19bd3b58 reconcile korg/master into goog/master 2009-07-26 11:43:56 -07:00
Jean-Baptiste Queru
aedd747436 Merge korg/donut into korg/master 2009-07-25 17:48:03 -07:00
Hung-ying Tyan
6120ddd786 Capitalize the first letter of a VPN name. 2009-07-26 00:05:21 +08:00
Hung-ying Tyan
38a9daffa5 Fix secret EditText display and other fixes. 
+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
  instead of two dots.

Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
  profile.

Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.
 2009-07-25 05:37:42 +08:00
Fred Quintana
0e3b960a5e update the permissions for the AccountManagerService 2009-07-23 16:03:24 -07:00
Amith Yamasani
4baeebd285 am c25f8955: Link to bluetooth settings. 
Merge commit 'c25f8955bee14a26520457fca2ab79c013f6196e'

* commit 'c25f8955bee14a26520457fca2ab79c013f6196e':
  Link to bluetooth settings.
 2009-07-23 13:29:13 -07:00
Amith Yamasani
c25f8955be Link to bluetooth settings. 
WiFi -> Wi-Fi
 2009-07-22 16:26:20 -07:00
Android (Google) Code Review
7402052ab8 am 86637edf: Merge change 8183 into donut 
Merge commit '86637edfa2df69016afcabbfc581c00a16041745'

* commit '86637edfa2df69016afcabbfc581c00a16041745':
  Improve UX of adding credential...
 2009-07-22 16:09:09 -07:00
Android (Google) Code Review
86637edfa2 Merge change 8183 into donut 
* changes:
  Improve UX of adding credential...
 2009-07-22 15:44:42 -07:00
Hung-ying Tyan
d8858c3ee1 Improve UX of adding credential... 
with more toast messages and fix dialog handling when needs another
dialog to initialize or enable the credential storage.
 2009-07-23 06:41:15 +08:00
Chung-yih Wang
c7343d12f3 am c78e0b01: Fix the broken build 
Merge commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1'

* commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1':
  Fix the broken build
 2009-07-22 11:51:12 -07:00