Jeff Brown
48f4391bc7
am 46db3716
: am 6a5e32a6
: Merge "Move OVERLAY_DISPLAY_DEVICES to Global." into jb-mr1-dev
...
* commit '46db3716212076e758924b3dd599550207d1a3c4':
Move OVERLAY_DISPLAY_DEVICES to Global.
2012-09-25 17:09:24 -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
dd31ddc137
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:05:59 -07:00
Jeff Brown
cfc7fc1c69
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:05:50 -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
4bc3d18d8b
am fb357694
: am cd207ad4
: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
...
* commit 'fb357694450dae7c0bca21904c6e641195493465':
Fix regression in Bluetooth settings.
2012-09-25 16:33:25 -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
b6caa06648
am cd207ad4
: Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
...
* commit 'cd207ad437085fe3757259bd708fe74f68179094':
Fix regression in Bluetooth settings.
2012-09-25 16:30:07 -07:00
Jeff Brown
cd207ad437
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
2012-09-25 16:24:59 -07:00
Baligh Uddin
47d1d19f6d
Import translations. DO NOT MERGE
...
Change-Id: I0ce766e5ccb68544d1a32a6b1d2b0009f194870c
Auto-generated-cl: translation import
2012-09-25 16:12:06 -07:00
Svetoslav Ganov
263f744237
Show long message for a new user only once.
...
1. We show a longer message only for the first added user. The
longer message will be shown until the user has been created,
which is until the creator pokes the OK button in the create
new user dialog.
bug:7210780
Change-Id: Ifed4899048a8369f41f145af204a1e4e860f9b4c
2012-09-25 16:11:19 -07:00
Baligh Uddin
fe8e076e90
Import translations. DO NOT MERGE
...
Change-Id: Ic76cd17011c6da46ba5298eb2d1f081f7dc6f633
Auto-generated-cl: translation import
2012-09-25 16:09:15 -07:00
Baligh Uddin
c619f5aece
Import translations. DO NOT MERGE
...
Change-Id: Ied12646ca5b4a822a07db7f09b6036a165d549fe
Auto-generated-cl: translation import
2012-09-25 16:07:01 -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
Michael Jurka
293cf8d2da
am d31a0969
: am 16398c9c
: UI refinements to security screen widgets interface
...
* commit 'd31a0969015c9aa008c530413b098fe727c2299d':
UI refinements to security screen widgets interface
2012-09-25 15:34:14 -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
732b246c95
am 16398c9c
: UI refinements to security screen widgets interface
...
* commit '16398c9c973ba16a14455c4eee9ca162e0273792':
UI refinements to security screen widgets interface
2012-09-25 14:35:15 -07:00
Robert Greenwalt
00798e6bcd
Colorize premium sms ui.
...
bug:7205024
Change-Id: I1d32515d0822f5c96013708f26422d4700f7490b
2012-09-25 14:23:14 -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
The Android Automerger
a27ec92c2d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 07:00:27 -07:00
Jeff Brown
a17a5b814f
Fix regression in Bluetooth settings.
...
Bug: 7207090
Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
2012-09-24 20:33:51 -07:00
Adam Cohen
085d9b0db0
Addressing issue where power control widget disappears issue 7205586
...
Change-Id: I6eea146d3819d3b35f1420e59d4ebdbc66041a9e
2012-09-24 16:49:01 -07:00
Chris Wren
6ba109b14a
am 13d3d371
: am 8bea3c3f
: Merge "move remaining dock settings into sound settings fragment." into jb-mr1-dev
...
* commit '13d3d371b12d7d5b3478e0c1f9989de5d7972885':
move remaining dock settings into sound settings fragment.
2012-09-24 14:40:54 -07:00
Chris Wren
c4fab6f61f
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:39:06 -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
d1898e1796
am e3ee2823
: am 85d4b5f7
: Ensuring that keyguard widgets are bound with correct options
...
* commit 'e3ee28239712553face2e80cb69f62b616a84ab2':
Ensuring that keyguard widgets are bound with correct options
2012-09-24 14:12:13 -07:00
Adam Cohen
0c2281e1a9
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:57 -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
Jeff Sharkey
c295f455a2
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 14:00:01 -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
e15abb7bb1
am bad0a648
: am ff571fee
: Merge "Hide lockdown VPN when IMS auth is required." into jb-mr1-dev
...
* commit 'bad0a648a7f677f5bbf7e94a5d3d6f7fcd4a4370':
Hide lockdown VPN when IMS auth is required.
2012-09-24 13:13:43 -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
a85ffcf5ac
am 6f2f479c
: am c939735b
: Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
...
* commit '6f2f479c5cdeecec96a496fd75288b7eced4a0c5':
Addressing issue where power control widget disappears issue 7205586
2012-09-24 11:53:35 -07:00
Adam Cohen
56709207ce
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:31 -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
51e3e50acd
am dde890a6
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'dde890a6d34b40eac75a018b659221216e5c7203':
2012-09-24 10:18:44 -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
f3db3ea04b
am 16a6fd4b
: am 7fb91855
: Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev
...
* commit '16a6fd4bb43927bdabe3ed7985b5efedaaf659e4':
Show more settings and add restrictions/dialogs for secondary users
2012-09-24 09:33:50 -07:00
Jeff Sharkey
150ccef5a4
am c912f5c6
: am 0e9cf8a7
: Storage item to represent cached data.
...
* commit 'c912f5c6ab48b6ba81a79af561b571faa6396526':
Storage item to represent cached data.
2012-09-24 09:33:49 -07:00
Baligh Uddin
fd6b66020b
am fb6cea75
: (-s ours) am b1055311
: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'fb6cea755cb61ba20298ba0c5935f83cb385fdf2':
Import translations. DO NOT MERGE
2012-09-24 09:33:48 -07:00
Baligh Uddin
84964f1259
am dea83bdd
: am 17b7a8cd
: Merge "Remove no longer used dream_settings.xml." into jb-mr1-dev
...
* commit 'dea83bdd138e083e2d3207ae9e52bc5f73a57e82':
Remove no longer used dream_settings.xml.
2012-09-24 09:33:47 -07:00