summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 3b7ffa5e: am 01a868d7: Merge "Strings for new Dock settings screen, to ↵Amith Yamasani2010-01-201-2/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | get started on the L10N." into eclair Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df' * commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df': Strings for new Dock settings screen, to get started on the L10N.
| * | am 01a868d7: Merge "Strings for new Dock settings screen, to get started on ↵Amith Yamasani2010-01-141-2/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | the L10N." into eclair Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp * commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156': Strings for new Dock settings screen, to get started on the L10N.
| | * Strings for new Dock settings screen, to get started on the L10N.Amith Yamasani2010-01-141-2/+19
| | |
* | | Initial UI for managing device policies.Dianne Hackborn2010-01-163-0/+151
| | | | | | | | | | | | | | | More to come... what is here now is very ugly, and completely missing the confirmation screen for setting a device administrator.
* | | WifiEnabler: add support to show supplicant state.Chia-chi Yeh2010-01-161-1/+51
| | |
* | | Settings: revise WifiEnabler and BluetoothEnabler.Chia-chi Yeh2010-01-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This mainly changes the way both enablers react to the airplane mode. Now enablers show a toast message instead of disabling the check box directly. This avoids the inconsistent state introduced by WirelessSettings which controls the check box using layout dependency. Related bug: 2053751
* | | Merge "Change filter options from being menu items to tabbed views. Remove ↵Suchi Amalapurapu2010-01-121-4/+0
|\ \ \ | | | | | | | | | | | | unused strings."
| * | | Change filter options from being menu items to tabbed views.Suchi Amalapurapu2010-01-121-4/+0
| | | | | | | | | | | | | | | | Remove unused strings.
* | | | Merge "Haptic feedback setting doesn't need to be disabled in Silent mode."Amith Yamasani2010-01-121-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Haptic feedback setting doesn't need to be disabled in Silent mode.Amith Yamasani2010-01-121-2/+1
| | | | | | | | | | | | | | | | Removed dependency on silent mode setting. Must have been a copy/paste error.
* | | | Fix 2332563: Add password-lock support to lockscreenJim Miller2010-01-119-54/+710
|/ / /
* | | Deprecate fill_parent and introduce match_parent.Romain Guy2010-01-0854-319/+319
| | | | | | | | | | | | Bug: #2361749.
* | | Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules.Eric Fischer2010-01-0830-30/+30
| | | | | | | | | | | | | | | | | | | | | Previously it was using America/Araguaina, which does not currently observe DST. Brasilia is actually in an area that follows the Sao_Paulo rules. Bug 2362824
* | | Update with latest translations.Eric Fischer2010-01-0740-4560/+4004
| | |
* | | settings: Change unmount button to a mount/unmount toggleSan Mehat2010-01-062-1/+9
| | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the dock strings back to ↵Michael Chan2010-01-061-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | "For Music and Media"" into eclair Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c' * commit 'd638a7cb0841184349edbec2c995a36e5719cb8c': b/2335545 Revert the dock strings back to "For Music and Media"
| * | am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and ↵Michael Chan2010-01-061-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Media"" into eclair Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp * commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e': b/2335545 Revert the dock strings back to "For Music and Media"
| | * b/2335545 Revert the dock strings back to "For Music and Media"Michael Chan2010-01-061-1/+1
| | | | | | | | | | | | Change-Id: I1c8cbfb07cfb9822d62a5fa688cee060f81ab221
* | | Allow bluetooth in airplane mode when in "toggleable" list.Jeff Sharkey2009-12-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of radios that can be toggled while in airplane mode. This CL changes BluetoothEnabler to respect this. It parallels the logic in WifiEnabler, which enables OEMs to allow Wifi changes when in airplane mode. Most existing devices don't include "bluetooth" in the toggleable list, which means bluetooth will continue to be disabled when in airplane mode for those devices. Fixes http://b/2297314
* | | am eea5133f: am c0a606d2: b/2334482 Revert white spacesMichael Chan2009-12-171-36/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'eea5133fa927afcc90a70a5026d3873821b2dfd3' * commit 'eea5133fa927afcc90a70a5026d3873821b2dfd3': b/2334482 Revert white spaces
| * | am c0a606d2: b/2334482 Revert white spacesMichael Chan2009-12-171-36/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d' into eclair-plus-aosp * commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d': b/2334482 Revert white spaces
| | * b/2334482 Revert white spacesMichael Chan2009-12-171-36/+36
| | | | | | | | | | | | Change-Id: I52981da0928a9852f3256a7cee1f03768d7735a4
* | | am 51477943: am c611e5a7: b/2334482 Dock string changed to Music, ringer, ↵Michael Chan2009-12-171-37/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | alarms (silences phone) Merge commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d' * commit '5147794329ee6a6b503ce13dff3dc0a50a355c6d': b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
| * | am c611e5a7: b/2334482 Dock string changed to Music, ringer, alarms ↵Michael Chan2009-12-171-37/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | (silences phone) Merge commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38' into eclair-plus-aosp * commit 'c611e5a7c6773f3410f7ba60dc34071f7301ed38': b/2334482 Dock string changed to Music, ringer, alarms (silences phone)
| | * b/2334482 Dock string changed to Music, ringer, alarms (silences phone)Michael Chan2009-12-171-37/+37
| | | | | | | | | | | | Change-Id: I36ee0f20b35df1d8f91f543dd315fc8cef184143
| * | am e273289c: Merge change Ic0ce5c9a into eclairEric Fischer2009-12-0920-75/+193
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-plus-aosp * commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2009-12-0920-75/+193
| | |
| * | am 0c75b2d2: Merge change I80790bdb into eclairMichael Chan2009-12-071-2/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp * commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350': b/2296110 Dialog for setting up dock audio.
| * | am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.Michael Chan2009-12-033-21/+57
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-plus-aosp * commit '0bd445b974292dc3910b6bb85dcee7e7c378968f': b/2296110 New Dialog which appears when phone is place on dock.
| * \ \ am e2caf2ee: Merge change I82be95f6 into eclairAmith Yamasani2009-12-023-4/+29
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-plus-aosp * commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8': Feature #2296147 Settings for Car/Desk Dock on certain devices
| * \ \ \ am 81482b04: Import revised translations. DO NOT MERGEEric Fischer2009-12-0221-3/+82
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '81482b04be2147bf88f96290581cc2fd2093b5a9' into eclair-plus-aosp * commit '81482b04be2147bf88f96290581cc2fd2093b5a9': Import revised translations. DO NOT MERGE
| * \ \ \ \ am 8f2fb65b: Setting in Sound & Display for trackball pulsing on ↵Amith Yamasani2009-12-023-2/+33
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification. Bug #2238250 Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp * commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03': Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
| * \ \ \ \ \ am 76395bc9: Import revised translations. DO NOT MERGEEric Fischer2009-11-3013-120/+120
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7' into eclair-plus-aosp * commit '76395bc9bc0f2db49d37fd94017c01ca1c8fb1a7': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ am 18517f50: Import revised translations. DO NOT MERGEEric Fischer2009-11-161-6/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-plus-aosp * commit '18517f50edcfebf41b61965b24e360858db1c5e4': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ am 83e718f9: Import revised translations. DO NOT MERGEEric Fischer2009-11-1328-462/+443
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '83e718f92710c766ef341fdde769b2efc489bef9' into eclair-plus-aosp * commit '83e718f92710c766ef341fdde769b2efc489bef9': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ am 48c451b3: Import revised translations. DO NOT MERGEEric Fischer2009-11-1322-134/+162
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-plus-aosp * commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ am 6b23b270: Fix misspellings in the Settings app.Jason Chen2009-11-111-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp * commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c': Fix misspellings in the Settings app.
| * \ \ \ \ \ \ \ \ \ \ am 7ceb387e: Merge change Ib720a080 into eclairDaniel Sandler2009-11-1031-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp * commit '7ceb387ee601655ba72264646e3d8ecf2d74c138': Updated icons for Settings. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ am 9d6be2ba: Add backup string for a platform setting to enable or disable ↵Jean-Michel Trivi2009-11-021-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | advanced audio recording features on QSD8k phones. Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp * commit '9d6be2baf517462d2cce818c21b25958a40e4f06': Add backup string for a platform setting to enable or disable
| * \ \ \ \ \ \ \ \ \ \ \ \ am 8e3c8c20: Merge change I1d016ce3 into eclairEric Fischer2009-10-3038-90/+292
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a' into eclair-plus-aosp * commit '8e3c8c209b1f13d1704669887edb47df0a1afc0a': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 0cb3743e: b/2219381 Gray out Bluetooth Settings for the emulatorMichael Chan2009-10-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0cb3743e93aef81e7669f1e6c81184559e0f8154' into eclair-plus-aosp * commit '0cb3743e93aef81e7669f1e6c81184559e0f8154': b/2219381 Gray out Bluetooth Settings for the emulator
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dd45a47b: Merge change I4d31288f into eclairAmith Yamasani2009-10-291-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp * commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec': Fix for 1974140. Delete entry if not valid on hitting home.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 17fcd476: Import revised translations. DO NOT MERGEEric Fischer2009-10-2823-275/+215
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-plus-aosp * commit '17fcd476643e27943f548415e49e1be7d8e74ac1': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d02acfb9: Merge change I2abbb876 into eclairMike Cleron2009-10-2898-124/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd02acfb908562780eec830a85e121f9925108c36' into eclair-plus-aosp * commit 'd02acfb908562780eec830a85e121f9925108c36': New widgets
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e0711522: Use consistent punctuation for the Chinese locale names.Eric Fischer2009-10-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp * commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0': Use consistent punctuation for the Chinese locale names.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 195bc434: Add Authentication Type field to the APN settings.Jaikumar Ganesh2009-10-262-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp * commit '195bc43460967e57e4c1131ba156083a93e0e4e8': Add Authentication Type field to the APN settings.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b3735744: Merge change I40dd2cfc into eclairAmith Yamasani2009-10-231-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp * commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50': Fix for 2202408: Replace Never Timeout with 30 minutes
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e304b9f4: Add a intent extra to only show the access points in the ↵Neel Parekh2009-10-222-2/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings menu. Merge commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3' into eclair-plus-aosp * commit 'e304b9f4f7f5bf07522fcc05615d172abd6c52a3': Add a intent extra to only show the access points in the settings menu.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8355d934: Import revised translations. DO NOT MERGEEric Fischer2009-10-2139-2365/+2493
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-plus-aosp * commit '8355d9343455eaacf559f0df0e752f236b7464d2': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 06a111be: Merge change Ia3151ad3 into eclairEric Fischer2009-10-071-66/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp * commit '06a111be6d3ccf44de545a084302c2085cbb07de': Import revised translations. DO NOT MERGE