PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
930 Commits 1 Branch 0 Tags
3f20d2782ffd00d46ce9a2c017e02d0cde72429c
Commit Graph

930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
9f1900dc05 Fix issue #2185893: Can not install 3D Media Gallery 
Allow the package details to show packages whose .apk is not installed.

Change-Id: I45aec93e6f731beb5fe7010ec680eb8df0241aed
 2009-10-13 15:03:57 -07:00
Chung-yih Wang
2683c04ae8 am 5676ccab: Merge change I69ea4234 into eclair-mr2 
Merge commit '5676ccab335401e79beef78ad0585a2a40aaf42c' into eclair-mr2-plus-aosp

* commit '5676ccab335401e79beef78ad0585a2a40aaf42c':
  Remove the getHumanReadibleSsid().
 2009-10-13 09:36:33 -07:00
Android (Google) Code Review
5676ccab33 Merge change I69ea4234 into eclair-mr2 
* changes:
  Remove the getHumanReadibleSsid().
 2009-10-13 10:39:01 -04:00
Chung-yih Wang
69ea4234a0 Remove the getHumanReadibleSsid(). 
Since we already push down the quotes handling in WifiService.java,
there is no need of the function.
 2009-10-13 18:11:52 +08:00
Hung-ying Tyan
ae59063b7a am f20623b2: Merge change I6983cab3 into eclair-mr2 
Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp

* commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b':
  Add saving/restoring state in CredentialInstaller and ...
 2009-10-13 03:00:12 -07:00
Android (Google) Code Review
f20623b2b6 Merge change I6983cab3 into eclair-mr2 
* changes:
  Add saving/restoring state in CredentialInstaller and ...
 2009-10-13 05:54:26 -04:00
Hung-ying Tyan
2b9d9ef2aa Add saving/restoring state in CredentialInstaller and ... 
make it transparent.
 2009-10-13 17:40:25 +08:00
Chung-yih Wang
c0ef160be7 am a5b7b45b: Push down the supplicant-specific double-quote handling to framework. 
Merge commit 'a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da' into eclair-mr2-plus-aosp

* commit 'a5b7b45b6fe125b5f04d248b0f624eee9a7ea7da':
  Push down the supplicant-specific double-quote handling to framework.
 2009-10-12 18:41:08 -07:00
Chung-yih Wang
a5b7b45b6f Push down the supplicant-specific double-quote handling to framework. 
So we are able to connect to AP with ssid containing double-quotes.
 2009-10-09 11:29:45 +08:00
Eric Fischer
b8ecb29779 am 5204b662: am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '5204b662a0c155f695cf4e7b6341872a803a7e80' into eclair-mr2-plus-aosp

* commit '5204b662a0c155f695cf4e7b6341872a803a7e80':
 2009-10-08 17:52:46 -07:00
Jaikumar Ganesh
9e9760903d am db99bb36: am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly. 
Merge commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91' into eclair-mr2-plus-aosp

* commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91':
 2009-10-08 17:52:42 -07:00
Eric Fischer
978a951293 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 2009-10-08 17:52:42 -07:00
Eric Fischer
5204b662a0 am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-mr2

* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
  Import revised translations.  DO NOT MERGE
 2009-10-08 17:35:21 -07:00
Jaikumar Ganesh
db99bb3644 am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly. 
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2

* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
  Show an error message when the remote side cancels the authentication
 2009-10-08 17:30:28 -07:00
Eric Fischer
a8d752069c am 9ef9801f: am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-plus-aosp

* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
  Import revised translations.  DO NOT MERGE
 2009-10-08 15:15:52 -07:00
Eric Fischer
9ef9801f6f am 0512f51f: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72' into eclair

* commit '0512f51f21901e4a3f3f60aba82e3bb87ab0cc72':
  Import revised translations.  DO NOT MERGE
 2009-10-08 15:02:30 -07:00
Jaikumar Ganesh
d9896e86d0 am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly. 
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-plus-aosp

* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
  Show an error message when the remote side cancels the authentication
 2009-10-08 13:18:24 -07:00
Michael Chan
875a034b6e am 81cdaff7: b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings. 
Merge commit '81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5' into eclair-mr2-plus-aosp

* commit '81cdaff7b5aed3ea2b987b23e2e9a6c0213b0aa5':
  b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings.
 2009-10-08 12:07:14 -07:00
Michael Chan
81cdaff7b5 b/2173596 Cancel Bluetooth scanning when the user leaves Bluetooth Settings. 
Change-Id: Ib4dd6254c90da619e853b1be22fba3ff1365258e
 2009-10-08 11:55:47 -07:00
Jaikumar Ganesh
c065348eba Show an error message when the remote side cancels the authentication 
and show OPP device list correctly.

Dr No: Eastham
Bug: 2174874
 2009-10-08 08:06:27 -07:00
Nick Pelly
1577fac18a am 94ca23dc: am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter(). 
Merge commit '94ca23dcb049c11b097c3c1f9fe9091b3d40d337' into eclair-mr2-plus-aosp

* commit '94ca23dcb049c11b097c3c1f9fe9091b3d40d337':
 2009-10-07 16:41:31 -07:00
Nick Pelly
c74237633f Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp 2009-10-07 16:41:31 -07:00
Nick Pelly
99479dd32f am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter(). 
Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-plus-aosp

* commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf':
  Update application code for BluetoothAdapter.getDefaultAdapter().
 2009-10-07 16:36:16 -07:00
Nick Pelly
94ca23dcb0 am d1a04291: Update application code for BluetoothAdapter.getDefaultAdapter(). 
Merge commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf' into eclair-mr2

* commit 'd1a04291c537e271999c7e7c5c72f1f61632aacf':
  Update application code for BluetoothAdapter.getDefaultAdapter().
 2009-10-07 16:36:07 -07:00
Nick Pelly
d1a04291c5 Update application code for BluetoothAdapter.getDefaultAdapter(). 
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug: 2158765
Joke: When is a car not a car? When it turns into a driveway.
 2009-10-08 01:03:34 +02:00
Eric Fischer
4f962ace77 am 06a111be: Merge change Ia3151ad3 into eclair 
Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp

* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
  Import revised translations.   DO NOT MERGE
 2009-10-07 12:08:59 -07:00