Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
906 Commits 1 Branch 0 Tags
18828fa65dfac58a8a0f7d3798c7c35f64d1ea20
Commit Graph

906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
18828fa65d am 7bb19a89: am 17fcd476: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '7bb19a892cdf94d017a2046b374f977d47d20597' into eclair-mr2-plus-aosp

* commit '7bb19a892cdf94d017a2046b374f977d47d20597':
  Import revised translations.  DO NOT MERGE
 2009-10-29 19:54:47 -07:00
Eric Fischer
7bb19a892c am 17fcd476: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '17fcd476643e27943f548415e49e1be7d8e74ac1' into eclair-mr2

* commit '17fcd476643e27943f548415e49e1be7d8e74ac1':
  Import revised translations.  DO NOT MERGE
 2009-10-29 19:24:59 -07:00
Mike Lockwood
6dab602fdf am acfc96f1: am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode. 
Merge commit 'acfc96f1504ffa01fcdf78e9ff3c91917a9401c1' into eclair-mr2-plus-aosp

* commit 'acfc96f1504ffa01fcdf78e9ff3c91917a9401c1':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
 2009-10-29 13:56:08 -07:00
Mike Lockwood
acfc96f150 am 53dcdeeb: Don\'t restore old brightness when cancelling brightness dialog in automatic mode. 
Merge commit '53dcdeeb85e523e0b752d802d3413f5d4001d575' into eclair-mr2

* commit '53dcdeeb85e523e0b752d802d3413f5d4001d575':
  Don't restore old brightness when cancelling brightness dialog in automatic mode.
 2009-10-29 13:45:44 -07:00
Mike Cleron
5eea842271 am ac465854: am d02acfb9: Merge change I2abbb876 into eclair 
Merge commit 'ac465854ac29aa001578c0fe0d64c71b213b1759' into eclair-mr2-plus-aosp

* commit 'ac465854ac29aa001578c0fe0d64c71b213b1759':
  New widgets
 2009-10-29 01:43:12 -07:00
Mike Cleron
ac465854ac am d02acfb9: Merge change I2abbb876 into eclair 
Merge commit 'd02acfb908562780eec830a85e121f9925108c36' into eclair-mr2

* commit 'd02acfb908562780eec830a85e121f9925108c36':
  New widgets
 2009-10-29 01:26:57 -07:00
Eric Fischer
17fcd47664 Import revised translations. DO NOT MERGE 2009-10-28 21:19:37 -07:00
Mike Lockwood
53dcdeeb85 Don't restore old brightness when cancelling brightness dialog in automatic mode. 
Fixes a problem that could result in the backlight getting set to a bogus brightness
level if you open the dialog and cancel when in automatic mode.

Bug b/2015734

Change-Id: I302697e4ebd37afcdbfdd74ba0b1cc9be27ee40b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-10-28 18:33:04 -04:00
Eric Fischer
4f75cca2cd am a4ec838d: am e0711522: Use consistent punctuation for the Chinese locale names. 
Merge commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b' into eclair-mr2-plus-aosp

* commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b':
  Use consistent punctuation for the Chinese locale names.
 2009-10-28 11:56:00 -07:00
Eric Fischer
a4ec838d12 am e0711522: Use consistent punctuation for the Chinese locale names. 
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2

* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
  Use consistent punctuation for the Chinese locale names.
 2009-10-28 11:43:04 -07:00
Jaikumar Ganesh
afed5fca00 am 760b45c2: am 195bc434: Add Authentication Type field to the APN settings. 
Merge commit '760b45c2a688876b94383561163244de8086f1c6' into eclair-mr2-plus-aosp

* commit '760b45c2a688876b94383561163244de8086f1c6':
  Add Authentication Type field to the APN settings.
 2009-10-28 10:42:30 -07:00
Jaikumar Ganesh
760b45c2a6 am 195bc434: Add Authentication Type field to the APN settings. 
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2

* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
  Add Authentication Type field to the APN settings.
 2009-10-28 10:30:20 -07:00
Android (Google) Code Review
d02acfb908 Merge change I2abbb876 into eclair 
* changes:
  New widgets
 2009-10-28 03:16:41 -04:00
Mike Cleron
c151e45d8c New widgets 2009-10-27 14:05:27 -07:00
Eric Fischer
e0711522bc Use consistent punctuation for the Chinese locale names. 
Bug 2216349
 2009-10-27 10:30:54 -07:00
Jaikumar Ganesh
195bc43460 Add Authentication Type field to the APN settings. 
Bug: 1817100
 2009-10-26 15:18:23 -07:00
Robert Greenwalt
3f370d8ef8 am 0a4ab1ea: Disable Save of empty-named AP. 
Merge commit '0a4ab1eab20d5492bf7c87e348fd26d6c56889b9' into eclair-mr2-plus-aosp

* commit '0a4ab1eab20d5492bf7c87e348fd26d6c56889b9':
  Disable Save of empty-named AP.
 2009-10-26 14:28:23 -07:00
Amith Yamasani
32ac210016 am f0fed9dc: am b3735744: Merge change I40dd2cfc into eclair 
Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp

* commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be':
  Fix for 2202408: Replace Never Timeout with 30 minutes
 2009-10-26 14:28:13 -07:00
Neel Parekh
c342f09345 am eb48882e: am 62d3407d: Minor change to use defined key rather than a string. 
Merge commit 'eb48882e18ba9b1241a4d79c0cd45d6994b6dec6' into eclair-mr2-plus-aosp

* commit 'eb48882e18ba9b1241a4d79c0cd45d6994b6dec6':
  Minor change to use defined key rather than a string.
 2009-10-26 14:28:03 -07:00
Robert Greenwalt
0a4ab1eab2 Disable Save of empty-named AP. 
Empty SSID names can cause weird problems, so don't allow the user to save them.

bug: 2211656
 2009-10-26 13:51:06 -07:00
Amith Yamasani
f0fed9dc87 am b3735744: Merge change I40dd2cfc into eclair 
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2

* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
  Fix for 2202408: Replace Never Timeout with 30 minutes
 2009-10-23 10:17:43 -07:00
Neel Parekh
eb48882e18 am 62d3407d: Minor change to use defined key rather than a string. 
Merge commit '62d3407de4a843cb83397fa757bc89653d78c800' into eclair-mr2

* commit '62d3407de4a843cb83397fa757bc89653d78c800':
  Minor change to use defined key rather than a string.
 2009-10-23 10:17:38 -07:00
Android (Google) Code Review
b3735744fd Merge change I40dd2cfc into eclair 
* changes:
  Fix for 2202408: Replace Never Timeout with 30 minutes
 2009-10-23 13:09:14 -04:00
Patrick Scott
b52788de3e am a2bfad13: Fix the build. 
Merge commit 'a2bfad13995d8ee00ab084f1ce5c31aea5db1317' into eclair-mr2-plus-aosp

* commit 'a2bfad13995d8ee00ab084f1ce5c31aea5db1317':
  Fix the build.
 2009-10-23 07:29:08 -07:00
Patrick Scott
a2bfad1399 Fix the build. 2009-10-23 09:53:06 -04:00
Amith Yamasani
40dd2cfcfd Fix for 2202408: Replace Never Timeout with 30 minutes 
Maximum timeout is now 30 minutes. Never Timeout will cause
burn-in problems with OLED and a bit with LCD as well.
 2009-10-22 20:57:32 -07:00
Neel Parekh
83ee51b485 am 0bc64d45: resolved conflicts for merge of e304b9f4 to eclair-mr2 
Merge commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19' into eclair-mr2-plus-aosp

* commit '0bc64d45b418c70dca77a74ddbea62612ae4fe19':
  Add a intent extra to only show the access points in the settings menu.
 2009-10-22 18:34:49 -07:00
Neel Parekh
62d3407de4 Minor change to use defined key rather than a string. 2009-10-22 18:30:00 -07:00
Neel Parekh
0bc64d45b4 resolved conflicts for merge of e304b9f4 to eclair-mr2 2009-10-22 18:26:46 -07:00
Neel Parekh
e304b9f4f7 Add a intent extra to only show the access points in the settings menu. 
Bug: 2198865
 2009-10-22 17:37:58 -07:00
Eric Fischer
aa5a28077c am 53250b3a: am 8355d934: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '53250b3aa8c85adb31bfe9db30907f72acab7103' into eclair-mr2-plus-aosp

* commit '53250b3aa8c85adb31bfe9db30907f72acab7103':
  Import revised translations.  DO NOT MERGE
 2009-10-22 09:34:29 -07:00
Eric Fischer
53250b3aa8 am 8355d934: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '8355d9343455eaacf559f0df0e752f236b7464d2' into eclair-mr2

* commit '8355d9343455eaacf559f0df0e752f236b7464d2':
  Import revised translations.  DO NOT MERGE
 2009-10-22 06:45:55 -07:00
Eric Fischer
8355d93434 Import revised translations. DO NOT MERGE 
Approver: jerryw
 2009-10-21 10:47:42 -07:00
Amith Yamasani
28309905ad am 8e10261e: am 941c3b17: Merge change I61c28c5f into eclair 
Merge commit '8e10261e87cf4b474cde0acb5fd837272e8c147e' into eclair-mr2-plus-aosp

* commit '8e10261e87cf4b474cde0acb5fd837272e8c147e':
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
 2009-10-19 15:33:43 -07:00
Amith Yamasani
8e10261e87 am 941c3b17: Merge change I61c28c5f into eclair 
Merge commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd' into eclair-mr2

* commit '941c3b1794203b48a8aa2e9d6f04c09d412262bd':
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
 2009-10-19 15:27:14 -07:00
Android (Google) Code Review
941c3b1794 Merge change I61c28c5f into eclair 
* changes:
  Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141
 2009-10-19 18:22:38 -04:00
Amith Yamasani
270d273e55 Use radio hunting time in addition to signal strength for cell standby computation. Fixes #2176141 2009-10-19 15:21:33 -07:00
Tammo Spalink
45bbba8543 am f239f3e0: Merge change Iec5461bc into eclair-mr2 
Merge commit 'f239f3e082edec0063de8c35bdf8045851252213' into eclair-mr2-plus-aosp

* commit 'f239f3e082edec0063de8c35bdf8045851252213':
  Remove OEM-specific bits from RadioInfo.
 2009-10-18 20:14:03 -07:00
Android (Google) Code Review
f239f3e082 Merge change Iec5461bc into eclair-mr2 
* changes:
  Remove OEM-specific bits from RadioInfo.
 2009-10-18 23:07:15 -04:00
Mike Lockwood
1d855b1883 am ee693a12: am cdf42466: Remove PowerManager.setAutoBrightness() 
Merge commit 'ee693a120ac57a84268d70447f12920827fbea6e' into eclair-mr2-plus-aosp

* commit 'ee693a120ac57a84268d70447f12920827fbea6e':
  Remove PowerManager.setAutoBrightness()
 2009-10-16 09:43:20 -07:00
Mike Lockwood
ee693a120a am cdf42466: Remove PowerManager.setAutoBrightness() 
Merge commit 'cdf42466bf3471337f1355b872eb2d529ba9409c' into eclair-mr2

* commit 'cdf42466bf3471337f1355b872eb2d529ba9409c':
  Remove PowerManager.setAutoBrightness()
 2009-10-16 09:37:47 -07:00
Tammo Spalink
a5f4c8f8c9 Remove OEM-specific bits from RadioInfo. 
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.

Addresses issue:
http://buganizer/issue?id=1645706

Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
 2009-10-16 10:24:18 +08:00
Mike Lockwood
cdf42466bf Remove PowerManager.setAutoBrightness() 
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.

Change-Id: I1850549f513e3541b5761aae28ebc615410377de
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-10-14 21:19:04 -07:00
Jean-Baptiste Queru
b4b73756d4 merge from open-source master 2009-10-14 16:02:18 -07:00
Eric Fischer
889f756808 am 880daa29: Merge change I1b21ba17 into eclair-mr2 
Merge commit '880daa29161330c97e65101659ed6b88066a3dbe' into eclair-mr2-plus-aosp

* commit '880daa29161330c97e65101659ed6b88066a3dbe':
  Import revised translations.  DO NOT MERGE
 2009-10-13 17:12:43 -07:00
Android (Google) Code Review
880daa2916 Merge change I1b21ba17 into eclair-mr2 
* changes:
  Import revised translations.  DO NOT MERGE
 2009-10-13 20:01:09 -04:00
Eric Fischer
1b21ba1738 Import revised translations. DO NOT MERGE 2009-10-13 16:07:48 -07:00
Dianne Hackborn
8271a531b7 am 3539cc5e: am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery 
Merge commit '3539cc5ef317b58c0e12c083d7cbda942658cad0' into eclair-mr2-plus-aosp

* commit '3539cc5ef317b58c0e12c083d7cbda942658cad0':
  Fix issue #2185893: Can not install 3D Media Gallery
 2009-10-13 15:56:52 -07:00
Dianne Hackborn
819f0843c8 am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery 
Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-plus-aosp

* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
  Fix issue #2185893: Can not install 3D Media Gallery
 2009-10-13 15:52:28 -07:00
Dianne Hackborn
3539cc5ef3 am 9f1900dc: Fix issue #2185893: Can not install 3D Media Gallery 
Merge commit '9f1900dc05773a0659030e21a8c2fa1641655669' into eclair-mr2

* commit '9f1900dc05773a0659030e21a8c2fa1641655669':
  Fix issue #2185893: Can not install 3D Media Gallery
 2009-10-13 15:51:41 -07:00