Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,396 Commits 1 Branch 0 Tags
4cc52da062189ccc08ccfefb4d47a9038bdf2f56
Commit Graph

1396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
4cc52da062 Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen." 2010-01-20 15:12:14 -08:00
Amith Yamasani
874372f8ca am 3b7ffa5e: am 01a868d7: Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair 
Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df'

* commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df':
  Strings for new Dock settings screen, to get started on the L10N.
 2010-01-20 14:36:08 -08:00
Michael Chan
4e5d33d49f am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair 
Merge commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48'

* commit '49efbf8b5b7a6817a4a1020982cb34f4ca226d48':
  b/2367861 Auto connect if the user turns on BT while docked.
 2010-01-20 14:35:08 -08:00
Jim Miller
47d380f1e6 Fix 2385283: Add DevicePolicyManager calls to LockScreen. 2010-01-20 13:37:14 -08:00
Dianne Hackborn
feff652132 Initial UI for managing device policies. 
More to come...  what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
 2010-01-16 18:30:05 -08:00
Chia-chi Yeh
feeb756132 WifiEnabler: add support to show supplicant state. 2010-01-16 07:09:20 +08:00
Amith Yamasani
3b7ffa5eef am 01a868d7: Merge "Strings for new Dock settings screen, to get started on 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.
 2010-01-14 17:04:45 -08:00
Amith Yamasani
01a868d73b Merge "Strings for new Dock settings screen, to get started on the L10N." into eclair 2010-01-14 16:33:15 -08:00
Amith Yamasani
237749dd85 Strings for new Dock settings screen, to get started on the L10N. 2010-01-14 16:27:37 -08:00
Michael Chan
49efbf8b5b am c9b9f650: Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair 
Merge commit 'c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5' into eclair-plus-aosp

* commit 'c9b9f650fcbce8ba2ab0b2e60e5334b02b4010e5':
  b/2367861 Auto connect if the user turns on BT while docked.
 2010-01-14 15:20:31 -08:00
Michael Chan
c9b9f650fc Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclair 2010-01-14 15:17:30 -08:00
Chia-chi Yeh
b90452f3d2 Settings: revise WifiEnabler and BluetoothEnabler. 
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
 2010-01-15 06:12:29 +08:00
Michael Chan
845e740fc6 b/2367861 Auto connect if the user turns on BT while docked. 
Change-Id: I855d0448af9c9c665fb8288c83cd13ae9c3d6050
 2010-01-14 11:26:18 -08:00
Suchi Amalapurapu
e751e555f7 Merge "Change filter options from being menu items to tabbed views. Remove unused strings." 2010-01-12 16:41:21 -08:00
Suchi Amalapurapu
38b8970706 Change filter options from being menu items to tabbed views. 
Remove unused strings.
 2010-01-12 16:41:45 -08:00
Amith Yamasani
a2e2a21060 am 213c35c0: (-s ours) am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair 
Merge commit '213c35c052375632487469c88227883ff1a0f1ac'

* commit '213c35c052375632487469c88227883ff1a0f1ac':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
 2010-01-12 16:14:30 -08:00
Amith Yamasani
213c35c052 am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair 
Merge commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp

* commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE
 2010-01-12 16:12:28 -08:00
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
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