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

1580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
d8d2127936 Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair 2010-01-12 16:10:17 -08:00
The Android Open Source Project
e5ce655b5c android-2.1_r1 snapshot 2010-01-12 15:19:17 -08:00
Amith Yamasani
20043f40fc Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE 
Backport from froyo.

If the monkey is running, exit the SIM lock settings activity.
 2010-01-12 14:55:16 -08:00
Amith Yamasani
1a0aba7a94 Merge "Haptic feedback setting doesn't need to be disabled in Silent mode." 2010-01-12 14:24:15 -08:00
Amith Yamasani
18b569ba00 Haptic feedback setting doesn't need to be disabled in Silent mode. 
Removed dependency on silent mode setting. Must have been a copy/paste error.
 2010-01-12 14:22:51 -08:00
San Mehat
0b12a7b207 Merge "Settings: Switch to new MountService api names" 2010-01-12 13:50:28 -08:00
Michael Chan
07723b5966 am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles by default for car dock. 
Merge commit 'd69a5ee28cb5164233805a751a7c3deafba58668'

* commit 'd69a5ee28cb5164233805a751a7c3deafba58668':
  b/2367020 Enable bt profiles by default for car dock.
 2010-01-12 13:45:36 -08:00
Michael Chan
d69a5ee28c am c5aa68f3: b/2367020 Enable bt profiles by default for car dock. 
Merge commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c' into eclair-plus-aosp

* commit 'c5aa68f3f2201227e85e52ee33937e70e7741c3c':
  b/2367020 Enable bt profiles by default for car dock.
 2010-01-12 13:42:04 -08:00
Michael Chan
c5aa68f3f2 b/2367020 Enable bt profiles by default for car dock. 
Change-Id: I95b1330ab432d38fb509321d843d04a41185d331
 2010-01-12 12:54:51 -08:00
San Mehat
33b0202273 Settings: Switch to new MountService api names 
Signed-off-by: San Mehat <san@google.com>
 2010-01-12 12:22:37 -08:00
Jim Miller
00d2476d8f Fix 2332563: Add password-lock support to lockscreen 2010-01-11 15:51:59 -08:00
Michael Chan
8edfd3a76b am 79270566: (-s ours) am d9d8ef26: Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair 
Merge commit '79270566b178ed7efc1c62f8410822d46d6e3152'

* commit '79270566b178ed7efc1c62f8410822d46d6e3152':
  b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
 2010-01-11 15:19:50 -08:00
Michael Chan
79270566b1 am d9d8ef26: Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair 
Merge commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722' into eclair-plus-aosp

* commit 'd9d8ef264d3a66e7be84908cf0f9d78713c42722':
  b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE
 2010-01-11 15:16:30 -08:00
Michael Chan
d9d8ef264d Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE" into eclair 2010-01-11 15:14:36 -08:00
Michael Chan
fb5b54d77a b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. DO NOT MERGE 
Change-Id: I02825cbde24ff0215787bb2d4f78cd6e7e1f4033
 2010-01-08 18:33:43 -08:00
Michael Chan
89a363ebbc Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state." 2010-01-08 18:14:38 -08:00
Michael Chan
537bdb0bb8 b/2335780 Fixed race conditions which causes BT to not be in the correct state in respect to the dock state. 
Change-Id: I4428708e02e7dcbb26795b0982cfe4389df60a46
 2010-01-08 17:17:08 -08:00
Romain Guy
3378715626 Deprecate fill_parent and introduce match_parent. 
Bug: #2361749.
 2010-01-08 15:11:59 -08:00
Eric Fischer
9bd889d7fb Merge "Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules." 2010-01-08 13:11:18 -08:00
Eric Fischer
da44d9f64a Change the "Brasilia" time zone to follow America/Sao_Paulo DST rules. 
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
 2010-01-08 12:39:44 -08:00
Amith Yamasani
db149c616f Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489" 2010-01-08 10:52:44 -08:00
Amith Yamasani
2e180ef880 Don't allow monkey to play with SIM lock settings. Bug # 2358489 
If the monkey is running, exit the SIM lock settings activity.
 2010-01-07 19:05:07 -08:00
Eric Fischer
ac052113c8 Update with latest translations. 2010-01-07 16:00:11 -08:00
Irfan Sheriff
567c44814f Merge "Do a null check on setting an AP as configured" 2010-01-07 10:53:52 -08:00
San Mehat
35351faed3 settings: Change unmount button to a mount/unmount toggle 
Signed-off-by: San Mehat <san@google.com>
 2010-01-06 21:41:47 -08:00
Irfan Sheriff
94a9f0a4ab Do a null check on setting an AP as configured 
This was introduced when trying to fix bug 2296038. A null check is required on AP.

Bug: 2296038
 2010-01-06 16:54:21 -08:00
Michael Chan
eea480c796 am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair 
Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c'

* commit 'd638a7cb0841184349edbec2c995a36e5719cb8c':
  b/2335545 Revert the dock strings back to "For Music and Media"
 2010-01-06 15:49:55 -08:00
Michael Chan
d638a7cb08 am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair 
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp

* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
  b/2335545 Revert the dock strings back to "For Music and Media"
 2010-01-06 15:47:57 -08:00
Michael Chan
04e32ff35f Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair 2010-01-06 15:44:30 -08:00
Michael Chan
55a05f8592 b/2335545 Revert the dock strings back to "For Music and Media" 
Change-Id: I1c8cbfb07cfb9822d62a5fa688cee060f81ab221
 2010-01-06 15:10:56 -08:00
Joe Onorato
0ea48d08f7 Merge "Stop spamming the log" 2010-01-06 14:05:14 -08:00
Joe Onorato
7111eea380 Stop spamming the log 2010-01-06 14:01:36 -08:00
Ying Wang
8d1d83ce13 am 759f48ba: am a718832e: Still use ro.monkey 
Merge commit '759f48ba1345a8827f217f8db3c71edfca1458c1'

* commit '759f48ba1345a8827f217f8db3c71edfca1458c1':
  Still use ro.monkey
 2010-01-06 13:57:51 -08:00
Ying Wang
759f48ba13 am a718832e: Still use ro.monkey 
Merge commit 'a718832e28095219a897c6e95e903c1a3fe57c12' into eclair-plus-aosp

* commit 'a718832e28095219a897c6e95e903c1a3fe57c12':
  Still use ro.monkey
 2010-01-06 13:46:13 -08:00
Ying Wang
a718832e28 Still use ro.monkey 
http://b/issue?id=1681101
So just some refactoring.
 2010-01-06 09:46:17 -08:00
Jean-Baptiste Queru
cb526ca66a Do not use a user tag on apps, as it is ignored. 
The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I80f66b5f5409f1d51d929adfddf291bae3e066e1
 2010-01-05 16:29:09 -08:00
Dianne Hackborn
517ea9ffea Update to use new ActivityManager.forceStopPackage() API. 2010-01-05 15:47:41 -08:00
Ying Wang
18e5cc1b1a am e0415214: am 50cb76f5: Rename ro.monkey to monkey.running 
Merge commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee'

* commit 'e0415214c82d6f648b8939ffbf88b7dee9aca1ee':
  Rename ro.monkey to monkey.running
 2010-01-04 13:49:34 -08:00
Ying Wang
e0415214c8 am 50cb76f5: Rename ro.monkey to monkey.running 
Merge commit '50cb76f58554dbccc51a754a73abef2debd8b721' into eclair-plus-aosp

* commit '50cb76f58554dbccc51a754a73abef2debd8b721':
  Rename ro.monkey to monkey.running
 2010-01-04 12:58:54 -08:00
Ying Wang
50cb76f585 Rename ro.monkey to monkey.running 
So that Monkey can set it before running and reset it after running.
 2010-01-04 12:04:25 -08:00
Chia-chi Yeh
4e14211d21 Settings: revise WifiSettings. 2009-12-25 14:48:46 +08:00
Android (Google) Code Review
c7b9d2ecc3 Merge change Ibad792b8 
* changes:
  Rename PdpConnection to GsmDataConnection
 2009-12-22 15:43:26 -08:00
Wink Saville
0d93697d3a Rename PdpConnection to GsmDataConnection 
Change-Id: Ibad792b858fd1f7abd6903b71cddcf7c58cd7ecc
 2009-12-22 14:36:47 -08:00
Jeff Sharkey
1c4e96864f Allow bluetooth in airplane mode when in "toggleable" list. 
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
 2009-12-22 14:35:44 -08:00
Michael Chan
fc34079510 am f4ec356d: am d8eec52a: b/2318290 connect should be called instead of connect(profile) if device is unpaired. 
Merge commit 'f4ec356df960245889da6f7518ec28c862ebf5e6'

* commit 'f4ec356df960245889da6f7518ec28c862ebf5e6':
  b/2318290 connect should be called instead of connect(profile) if device is unpaired.
 2009-12-21 14:39:06 -08:00
Michael Chan
f4ec356df9 am d8eec52a: b/2318290 connect should be called instead of connect(profile) if device is unpaired. 
Merge commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6' into eclair-plus-aosp

* commit 'd8eec52a3786a51b38ed280afd84005e6da05ce6':
  b/2318290 connect should be called instead of connect(profile) if device is unpaired.
 2009-12-21 14:36:14 -08:00
Irfan Sheriff
c9a663abf7 WifiSettings has leaked window 
Fix for leaked window
Bug: 2311236
 2009-12-18 14:52:14 -08:00
Michael Chan
d8eec52a37 b/2318290 connect should be called instead of connect(profile) if device is unpaired. 
Change-Id: I5d665d1c3149ffc77387f96c3822e80b84c78de1
 2009-12-17 14:30:05 -08:00
Michael Chan
a31ff9a139 am eea5133f: am c0a606d2: b/2334482 Revert white spaces 
Merge commit 'eea5133fa927afcc90a70a5026d3873821b2dfd3'

* commit 'eea5133fa927afcc90a70a5026d3873821b2dfd3':
  b/2334482 Revert white spaces
 2009-12-17 13:30:03 -08:00
Michael Chan
eea5133fa9 am c0a606d2: b/2334482 Revert white spaces 
Merge commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d' into eclair-plus-aosp

* commit 'c0a606d2d639c34bb763b73974e04e55f2d2ad8d':
  b/2334482 Revert white spaces
 2009-12-17 13:28:48 -08:00