Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
666 Commits 1 Branch 0 Tags
243e3fe0a4ec166d4e02ca3f1ffc72922574cdbe
Commit Graph

131 Commits

Author SHA1 Message Date
Jaikumar Ganesh
435ad270b5 resolved conflicts for merge of 1b7ffcf4 to master 2009-09-16 11:56:11 -07:00
Dianne Hackborn
21ee9c2403 am cded8478: Merge change 24553 into eclair 
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp

* commit 'cded847838c726342bfe56e69d417d160c73f212':
  Make running services show dependent processes.
 2009-09-10 13:05:53 -07:00
Dianne Hackborn
85710167c6 Make running services show dependent processes. 
And other various improvement and cleanup.

Change-Id: I0a33ab2876c8f409cd3cfecbbac574563ef1a162
 2009-09-10 12:08:53 -07:00
Hung-ying Tyan
6cdd5e8bc4 am f71c8b40: Add install-cert-from-sdcard in Security settings 
Merge commit 'f71c8b40b5a92e21d09dd75880e16aa857c1b6cb' into eclair-plus-aosp

* commit 'f71c8b40b5a92e21d09dd75880e16aa857c1b6cb':
  Add install-cert-from-sdcard in Security settings
 2009-09-10 02:06:34 -07:00
Hung-ying Tyan
f71c8b40b5 Add install-cert-from-sdcard in Security settings 
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
 2009-09-10 12:50:10 +08:00
Jaikumar Ganesh
c93110409c am 6ee7dd09: Merge change 24435 into eclair 
Merge commit '6ee7dd09138363737805ae1e6e93649959c6ab83' into eclair-plus-aosp

* commit '6ee7dd09138363737805ae1e6e93649959c6ab83':
  Fix display strings and enter passkey handling.
 2009-09-09 15:14:00 -07:00
Jaikumar Ganesh
67efa271bb Fix display strings and enter passkey handling. 2009-09-09 15:03:24 -07:00
Dianne Hackborn
b7558f3700 am 76315391: Improve running services to services managed by the system. 
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp

* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
  Improve running services to services managed by the system.
 2009-09-03 14:42:34 -07:00
Dianne Hackborn
76315391f0 Improve running services to services managed by the system. 
Also a little tweak to the animations preference.

Change-Id: I3183ef21e687a3b120d02c79e7388300084b9202
 2009-09-03 13:33:55 -07:00
Michael Chan
054509a8d4 am 77395cc3: b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed. Removed extra new lines in the passkey and pin dialogs because the string didn\'t fit in landscape mode. (scrollbars to appeared) 
Merge commit '77395cc39c88af0bb20ea18af532c87e934fb187' into eclair-plus-aosp

* commit '77395cc39c88af0bb20ea18af532c87e934fb187':
  b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
 2009-09-02 14:11:57 -07:00
Michael Chan
77395cc39c b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed. 
Removed extra new lines in the passkey and pin dialogs because the string didn't fit in landscape mode. (scrollbars to appeared)
 2009-09-02 12:30:05 -07:00
Dianne Hackborn
feab7249a9 am c58c549c: New UI for viewing and stopping currently running services. 
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp

* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
  New UI for viewing and stopping currently running services.
 2009-09-01 12:34:33 -07:00
Dianne Hackborn
c58c549cc9 New UI for viewing and stopping currently running services. 
Change-Id: I86012262635c911be23513aa0b027174b490374d
 2009-09-01 12:11:24 -07:00
Jean-Baptiste Queru
f602bc8bee merge from open-source master 2009-09-01 08:28:18 -07:00
Amith Yamasani
f411c9625c Show the Use location prompt only once if user agrees. Bug #1910370 2009-08-31 17:27:53 -07:00
Eric Fischer
fe4ddf853e Armor string format tokens with translation placeholders. 
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
 2009-08-28 13:02:24 -07:00
Hung-ying Tyan
7ca3655dcb Handle two new err codes: 
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
 2009-08-28 11:25:44 +08:00
Eric Fischer
d1de20d883 Fix strings whose apostrophes were eaten because of the lack of a backslash. 
Change-Id: I11619ef7bdd0d418e701930ae46b2b9c93ca07ac
 2009-08-27 13:52:31 -07:00
Joe LaPenna
626b4a191a Fix grammar in unknown sources dialog. issue 1938 2009-08-24 13:59:02 -07:00
Amith Yamasani
a0dc346f4c Remove summaries from top-level of settings. 2009-08-24 12:52:42 -07:00
Yue Lixin
a41e2f94b7 Implement Bluetooth device picker 
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
 2009-08-19 20:45:18 -07:00
Romain Guy
e140b09d1d Remove wallpapers picker 2009-08-13 12:52:06 -07:00
Dianne Hackborn
e25e4e4c57 Add new activity for picking live wallpapers. 2009-08-08 21:01:32 -07:00
Amith Yamasani
7f28787edf Re-ordered some Settings and renamed some. 
Reduced padding around the icons in the top level screen.
Re-ordered top-level settings.
Moved Airplane mode to the top of wireless & networks.
 2009-08-06 16:43:23 -07:00
Michael Chan
e41a4ca695 Modified the Bluetooth 2.1 Passkey confirmation dialog 
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
 2009-08-04 18:20:17 -07:00
Chouting Zhang
5ee0635923 Remove 'SIM Card Lock' from Security & Location settings for CDMA phones. 2009-08-04 10:20:32 -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
Jim Miller
b6f1080058 Change resource string to "Accounts & Synchronization" 2009-07-31 18:00:06 -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
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
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
Hung-ying Tyan
c157aadf56 Add error dialog when secrets are missing. 2009-07-29 15:08:50 +08: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
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
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
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
Hung-ying Tyan
41b5321e8b am 241610e9: Add password error hint when adding new cert. 
Merge commit '241610e986a8d2823f519762737903779089c253'

* commit '241610e986a8d2823f519762737903779089c253':
  Add password error hint when adding new cert.
 2009-07-21 07:12:23 -07:00
Amith Yamasani
a459dbe5bb am 8fb0ec36: UI improvements for "Battery use" app. 
Merge commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c'

* commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c':
  UI improvements for "Battery use" app.
 2009-07-20 23:33:46 -07:00
Mitsuru Oshima
7f44ca3170 Merge commit '5c20034b' into fix 
Conflicts:

	res/values/strings.xml
 2009-07-20 23:30:04 -07:00
Hung-ying Tyan
241610e986 Add password error hint when adding new cert. 2009-07-21 09:45:08 +08:00
Amith Yamasani
8fb0ec36ec UI improvements for "Battery use" app. 
Change the controls UI to display a suggestion.
Bluetooth AT command tracking (not enabled yet).
 2009-07-20 17:43:13 -07:00
Mitsuru Oshima
5c20034b7f moving compatibility mode option to spare parts 2009-07-20 15:52:29 -07:00
Jaikumar Ganesh
3a76bcaa83 Initial 2.1 bluetooth support. 
Need to work with Strings and UI person to fix and later test everything.
 2009-07-20 10:38:02 -07:00
Android (Google) Code Review
2fab4ab09c am 6b1b36a8: Merge change 7687 into donut 
Merge commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6'

* commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6':
  Add UI to handle PKCS12 cert.
 2009-07-17 15:43:07 -07:00
Hung-ying Tyan
38a44f2445 Add UI to handle PKCS12 cert. 2009-07-17 20:58:06 +08:00
Vivek Dlima
3d47738803 change all instances of displayed text 'apps' to 'applications' 2009-07-14 14:36:49 -07:00
Vivek Dlima
58f9c2b52d Updated Compatibility mode text. 2009-07-14 14:24:19 -07:00