Amith Yamasani
85f7ac3f63
am 0d9179c4: Merge "You section title for current user details" into jb-mr1-dev
...
* commit '0d9179c47338532bb2995130d07e458ab12bcb5c':
You section title for current user details
2012-09-25 17:21:15 -07:00
Amith Yamasani
0d9179c473
Merge "You section title for current user details" into jb-mr1-dev
2012-09-25 17:18:21 -07:00
Jeff Brown
8b9f0fda10
am 209898da: Merge "Update references to migrated global settings." into jb-mr1-dev
...
* commit '209898da754a0455864a9251723cb3ab91f36e46':
Update references to migrated global settings.
2012-09-25 17:07:48 -07:00
Jeff Brown
46db371621
am 6a5e32a6: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
...
* commit '6a5e32a658ac62e72092e3b5d8fb3b99cc4b5158':
Move OVERLAY_DISPLAY_DEVICES to Global.
2012-09-25 17:07:41 -07:00
Jeff Brown
209898da75
Merge "Update references to migrated global settings." into jb-mr1-dev
2012-09-25 17:04:11 -07:00
Jeff Brown
6a5e32a658
Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
2012-09-25 17:03:17 -07:00
Jeff Brown
fb35769445
am cd207ad4: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
...
* commit 'cd207ad437085fe3757259bd708fe74f68179094':
Fix regression in Bluetooth settings.
2012-09-25 16:30:55 -07:00
Jeff Brown
cd207ad437
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
2012-09-25 16:24:59 -07:00
Amith Yamasani
3104b04e16
You section title for current user details
...
Bug: 7232244
Change-Id: I04904f423f236b4dcfc2e1c61618eb88b80b593c
2012-09-25 15:48:05 -07:00
Jeff Brown
a2806b661f
Update references to migrated global settings.
...
Bug: 7231172
Change-Id: Ia4abbb6f897e93ebe38e6536fac7411b96eb2bb5
2012-09-25 15:22:01 -07:00
Jeff Brown
075cb30d4c
Move OVERLAY_DISPLAY_DEVICES to Global.
...
Bug: 7127417
Change-Id: I9ed62e98754eba8a6107a5cac00f00f83904852d
2012-09-25 15:22:01 -07:00
Michael Jurka
d31a096901
am 16398c9c: UI refinements to security screen widgets interface
...
* commit '16398c9c973ba16a14455c4eee9ca162e0273792':
UI refinements to security screen widgets interface
2012-09-25 14:35:31 -07:00
Michael Jurka
16398c9c97
UI refinements to security screen widgets interface
...
Bug #7158868
Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
2012-09-25 12:46:14 -07:00
Jeff Brown
a17a5b814f
Fix regression in Bluetooth settings.
...
Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
2012-09-24 20:33:51 -07:00
Chris Wren
13d3d371b1
am 8bea3c3f: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
...
* commit '8bea3c3fb8b3ecbb33fbd5b159faaa7d229e7cf1':
move remaining dock settings into sound settings fragment.
2012-09-24 14:38:56 -07:00
Chris Wren
8bea3c3fb8
Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
2012-09-24 14:37:24 -07:00
Adam Cohen
e3ee282397
am 85d4b5f7: Ensuring that keyguard widgets are bound with correct options
...
* commit '85d4b5f78e831fdfe6da39f6edafd32c7d63dfea':
Ensuring that keyguard widgets are bound with correct options
2012-09-24 14:10:37 -07:00
Adam Cohen
85d4b5f78e
Ensuring that keyguard widgets are bound with correct options
...
-> We need to bind the widget and indicate that it is a keyguard widget
Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
2012-09-24 13:17:40 -07:00
Jeff Sharkey
bad0a648a7
am ff571fee: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
...
* commit 'ff571fee86267348e852a07826ffc78cc43384ba':
Hide lockdown VPN when IMS auth is required.
2012-09-24 13:11:19 -07:00
Jeff Sharkey
ff571fee86
Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
2012-09-24 13:08:56 -07:00
Chris Wren
2bc32ae808
move remaining dock settings into sound settings fragment.
...
Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
2012-09-24 15:57:10 -04:00
Jeff Sharkey
07d465ddb8
Hide lockdown VPN when IMS auth is required.
...
Bug: 7069782
Change-Id: I978d89894da17164a1e0122adb5acbfda3586fa1
2012-09-24 12:56:29 -07:00
Adam Cohen
6f2f479c5c
am c939735b: Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
...
* commit 'c939735b176a3a401e8a3e60e9fd8a6a732a2dc0':
Addressing issue where power control widget disappears issue 7205586
2012-09-24 11:51:19 -07:00
Adam Cohen
c939735b17
Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
2012-09-24 11:49:24 -07:00
The Android Open Source Project
dde890a6d3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I736712a26a0e9991d500f7f654eb12dbbd511db4
2012-09-24 10:13:39 -07:00
Amith Yamasani
16a6fd4bb4
am 7fb91855: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
...
* commit '7fb91855b05b312e45bfded72d48e0cffcee4a44':
Show more settings and add restrictions/dialogs for secondary users
2012-09-24 09:26:01 -07:00
Jeff Sharkey
c912f5c6ab
am 0e9cf8a7: Storage item to represent cached data.
...
* commit '0e9cf8a723c3e03207e905e8e03303ec4b5526dc':
Storage item to represent cached data.
2012-09-24 09:26:00 -07:00
Baligh Uddin
fb6cea755c
am b1055311: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'b105531116148d5d29e113e611ac180aa9691c6e':
Import translations. DO NOT MERGE
2012-09-24 09:25:58 -07:00
Baligh Uddin
dea83bdd13
am 17b7a8cd: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
...
* commit '17b7a8cd1895871441c86afef5387acfa3b81b57':
Remove no longer used dream_settings.xml.
2012-09-24 09:25:57 -07:00
Romain Guy
4be0fe59d9
am 70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
...
* commit '70edd393bf6590647c12808e20efa928eba96705':
Add new developer setting to visualize overdraw
2012-09-24 09:25:56 -07:00
Svetoslav Ganov
dd381701db
am f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'f85e7e15a75d5a475e10940e1b3d570210729b64':
Accessibility multi-user support.
2012-09-24 09:25:55 -07:00
The Android Automerger
ca88cda071
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-24 06:59:22 -07:00
The Android Automerger
b44bdb2f59
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-23 19:00:18 -07:00
Amith Yamasani
7fb91855b0
Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
2012-09-23 18:47:20 -07:00
Amith Yamasani
9627a8ea15
Show more settings and add restrictions/dialogs for secondary users
...
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
2012-09-23 18:43:31 -07:00
Jeff Sharkey
0e9cf8a723
Storage item to represent cached data.
...
When touched, offers to clear all cached data.
Bug: 7216370
Change-Id: I86afe66b819fb7deeba909bef507925fc5a590f3
2012-09-23 17:49:31 -07:00
Baligh Uddin
b105531116
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-23 08:14:05 -07:00
Baligh Uddin
17b7a8cd18
Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
2012-09-23 08:13:38 -07:00
Baligh Uddin
9307c8e9f9
Import translations. DO NOT MERGE
...
Change-Id: Ie4f6419929f793550859314eb624135452f845f4
Auto-generated-cl: translation import
2012-09-22 14:20:39 -07:00
The Android Automerger
8deb86f7c9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:42:44 -07:00
John Spurlock
1ce93065a5
Remove no longer used dream_settings.xml.
...
Change-Id: I8355372f4dd2f99a92b4a708cf38276c5e7f41d4
2012-09-22 10:38:43 -04:00
Romain Guy
70edd393bf
Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
2012-09-21 19:28:12 -07:00
Romain Guy
098f493dba
Add new developer setting to visualize overdraw
...
Change-Id: I16d6bb5a199233efebf5c3211dbe57dc9b6729c9
2012-09-21 19:23:20 -07:00
Adam Cohen
2078b6916d
Addressing issue where power control widget disappears issue 7205586
...
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
2012-09-21 18:52:24 -07:00
Svetoslav Ganov
f85e7e15a7
Merge "Accessibility multi-user support." into jb-mr1-dev
2012-09-21 17:41:31 -07:00
Svetoslav Ganov
46045d8b12
Accessibility multi-user support.
...
1. Accessibility settings are now shown for every user.
bug:6967373
Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
2012-09-21 17:25:46 -07:00
Svetoslav Ganov
1bd69f9aba
am 0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '0a48c1690bd0aa7901e8fc737ca9e4dadec22ea4':
Remove accessibility category from developer options.
2012-09-21 17:15:42 -07:00
Svetoslav Ganov
0a48c1690b
Merge "Remove accessibility category from developer options." into jb-mr1-dev
2012-09-21 17:12:08 -07:00
Dianne Hackborn
3fea212396
am f4bd1a70: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit 'f4bd1a705f6b4e1e575c46f88ca91c02144e551e':
Fix issue 7198767, 7198366, 7189824.
2012-09-21 17:07:09 -07:00
Dianne Hackborn
f4bd1a705f
Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
2012-09-21 17:05:23 -07:00