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

2492 Commits

Author SHA1 Message Date
Amith Yamasani
c8168ba06e am 71964dd6: Merge change 23372 into eclair 
Merge commit '71964dd6598cf2b4744535e537ded21dbffe611c'

* commit '71964dd6598cf2b4744535e537ded21dbffe611c':
  Show the Use location prompt only once if user agrees. Bug #1910370
 2009-08-31 17:43:29 -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
Daniel Sandler
bd839196cd am b89653cb: Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896. 
Merge commit 'b89653cb954e6945d78a3f2ed876a1760c5d5484'

* commit 'b89653cb954e6945d78a3f2ed876a1760c5d5484':
  Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
 2009-08-31 16:43:17 -07:00
Daniel Sandler
3cdbc2dfc1 resolved conflicts for merge of 2b9fd2d7 to master 2009-08-31 16:41:57 -04:00
Daniel Sandler
b89653cb95 Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896. 2009-08-31 10:00:50 -04:00
Daniel Sandler
2b9fd2d739 Add missing hdpi frames of the unlock pattern animation. 2009-08-31 09:29:16 -04:00
Daniel Sandler
ca20eb42bc am 98fa0e29: Merge change 23149 into eclair 
Merge commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786'

* commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786':
  High-resolution (hdpi) artwork from TAT for Settings.
 2009-08-28 13:21:00 -07:00
Android (Google) Code Review
98fa0e2941 Merge change 23149 into eclair 
* changes:
  High-resolution (hdpi) artwork from TAT for Settings.
 2009-08-28 13:16:27 -07:00
Eric Fischer
22306cd2d1 am fe4ddf85: Armor string format tokens with translation placeholders. 
Merge commit 'fe4ddf853e2f6a9797037171e218bf30a25a254f'

* commit 'fe4ddf853e2f6a9797037171e218bf30a25a254f':
  Armor string format tokens with translation placeholders.
 2009-08-28 13:08:29 -07:00
Eric Fischer
fe4ddf853e Armor string format tokens with translation placeholders. 
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
 2009-08-28 13:02:24 -07:00
Daniel Sandler
0a9359310d High-resolution (hdpi) artwork from TAT for Settings. 2009-08-28 15:02:50 -04:00
Hung-ying Tyan
174034f3a4 am 7ca3655d: Handle two new err codes: 
Merge commit '7ca3655dcb620c8635ad84d1465ab2afc3ef31a0'

* commit '7ca3655dcb620c8635ad84d1465ab2afc3ef31a0':
  Handle two new err codes:
 2009-08-27 20:31:17 -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
e0a57efd80 am d1de20d8: Fix strings whose apostrophes were eaten because of the lack of a backslash. 
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d'

* commit 'd1de20d883725ce98931fbebeef9bed8c340352d':
  Fix strings whose apostrophes were eaten because of the lack of a backslash.
 2009-08-27 14:38:34 -07: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
Mike Lockwood
22dbcdc8f8 am cfb4089b: Merge change 22611 into eclair 
Merge commit 'cfb4089b372ee6be1c803a7deae56b464dc5d004'

* commit 'cfb4089b372ee6be1c803a7deae56b464dc5d004':
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
 2009-08-25 11:58:53 -07:00
Mike Lockwood
7f894124f4 Hide the "Enable Assisted GPS" checkbox in security & location settings. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-25 11:34:56 -07:00
Amith Yamasani
b68d94db25 am a0dc346f: Remove summaries from top-level of settings. 
Merge commit 'a0dc346f4c5511a92ba19333df0a8c576946992e'

* commit 'a0dc346f4c5511a92ba19333df0a8c576946992e':
  Remove summaries from top-level of settings.
 2009-08-24 15:32:28 -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
Eric Fischer
58db3ee507 am 57d72f2c: Merge change 22324 into eclair 
Merge commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7'

* commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7':
  Cap the length of dictionary words to keep TextView from exploding.
 2009-08-21 14:21:41 -07:00
Eric Fischer
c27b12c9dc Cap the length of dictionary words to keep TextView from exploding. 
Bug 1994172
 2009-08-21 11:17:46 -07:00
Yue Lixin
037c1f7290 am a41e2f94: Implement Bluetooth device picker 
Merge commit 'a41e2f94b792e44872be87f40fce182e6b39f4ba'

* commit 'a41e2f94b792e44872be87f40fce182e6b39f4ba':
  Implement Bluetooth device picker
 2009-08-19 21:04:53 -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
Amith Yamasani
74d9c353ed am 3bbb03ff: New settings top-level icons. 
Merge commit '3bbb03ffbb6abc3252a5b32a04d2752e49cc1706'

* commit '3bbb03ffbb6abc3252a5b32a04d2752e49cc1706':
  New settings top-level icons.
 2009-08-19 12:27:49 -07:00
Amith Yamasani
3bbb03ffbb New settings top-level icons. 2009-08-19 12:13:57 -07:00
Doug Zongker
2818107dcc am 36efef1d: cut number of frames in lock screen demo animation from 15 to 8 
Merge commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair

* commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
  cut number of frames in lock screen demo animation from 15 to 8
 2009-08-18 13:11:16 -07:00
Doug Zongker
36efef1d71 cut number of frames in lock screen demo animation from 15 to 8 
This trims about 108k out of the settings app, and the animation is
still acceptable.
 2009-08-18 10:02:33 -07:00
Eric Fischer
da99054ace Import revised translations. DO NOT MERGE 2009-08-17 13:15:56 -07:00
Android Git Automerger
f488ac9436 Merge commit '49e8d2e9' into eclair 2009-08-13 16:48:59 -07:00
Romain Guy
e140b09d1d Remove wallpapers picker 2009-08-13 12:52:06 -07:00
Android (Google) Code Review
49e8d2e90b Merge change 7060 into donut 
* changes:
  1. Added the missing timezone for mainland China "Asia/Shanghai". In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names.
 2009-08-13 00:03:43 -07:00
Karl Rosaen
b732a2848e Improve layout of lock tutorial, especially improved for sholes. 
Now, instead of having equal space overall above and below lock pattern widget,
the lock pattern widget is centered within the space above the button bar
at the bottom.  Also, removing the line below the lock pattern widget per
romain's recommendation; it looks goofy with the button bar below.

see screen shots in http://b/2045023 for the differences.
 2009-08-12 16:42:38 -07:00
Eric Fischer
c9e5fc45b0 Import revised translations. DO NOT MERGE 2009-08-10 17:57:14 -07:00
Eric Fischer
a016cb0048 Import revised translations. DO NOT MERGE 2009-08-10 10:48:54 -07:00
Dianne Hackborn
e25e4e4c57 Add new activity for picking live wallpapers. 2009-08-08 21:01:32 -07:00
Android (Google) Code Review
ede25bc845 Merge change 20355 
* changes:
  Re-ordered some Settings and renamed some.
 2009-08-07 06:34:08 -07:00
Jeff Sharkey
7e4a019e19 am 6c3287a4: Adopt new AppWidget assets, per http://b/2038594. 
Merge commit '6c3287a4d3a8e02322b501034db3133a3ccb1051'

* commit '6c3287a4d3a8e02322b501034db3133a3ccb1051':
  Adopt new AppWidget assets, per http://b/2038594.
 2009-08-06 22:57:48 -07:00
Jeff Sharkey
6c3287a4d3 Adopt new AppWidget assets, per http://b/2038594. 2009-08-06 22:37:08 -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
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
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
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
3deea37da3 Merge change 9116 
* changes:
  Allow enabling Wifi when in airplane mode.
 2009-07-30 08:35:41 -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