Robert Greenwalt
88b0140241
Precreate a data structure so it's never null.
...
Fixes NPE that the fast-fingered monkey sometimes triggers.
bug:7084178
Change-Id: Ibeb5e1ce678f59207de5dd321e06ae88ccc52216
2012-09-27 11:21:12 -07:00
Amith Yamasani
c866358410
am 0c3900af: am 04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
...
* commit '0c3900af385a3d8b6d0102edfa51e26a0f4b6a19':
Show warning dialog in a multiuser system when adding a new account.
2012-09-26 22:04:22 -07:00
Amith Yamasani
04c4ec607a
Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev
2012-09-26 22:01:19 -07:00
Jeff Sharkey
e38d3271c7
am 2a6668af: am 3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev
...
* commit '2a6668aff0a9e429d094f8f00fbbc60864f50c5c':
Clean up Global settings stragglers.
2012-09-26 20:22:58 -07:00
Jeff Sharkey
3db1413920
Merge "Clean up Global settings stragglers." into jb-mr1-dev
2012-09-26 20:15:20 -07:00
Amith Yamasani
eb71f26897
Show warning dialog in a multiuser system when adding a new account.
...
Bug: 7207092
Change-Id: I95ac107dbc867490dd2e492291501fd3630d267c
2012-09-26 18:02:54 -07:00
Jeff Brown
41be103950
am 4daf2f42: am 74c1d328: Avoid using hardcoded strings.
...
* commit '4daf2f42a9c3a61d7d52cf7714829a5874b36236':
Avoid using hardcoded strings.
2012-09-26 17:31:21 -07:00
Jeff Sharkey
08aafd445f
Clean up Global settings stragglers.
...
Bug: 7242121
Change-Id: Ibe62c70f88c946e46a0604a6999b5ca18ac18a1e
2012-09-26 17:11:43 -07:00
Jeff Brown
74c1d328e2
Avoid using hardcoded strings.
...
Bug: 7204211
Change-Id: Ida5f93719aad472964386f3591518547ddf32f94
2012-09-26 15:24:28 -07:00
Chris Wren
4a10ca3b37
am b402c81a: am 99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev
...
* commit 'b402c81a21e69798e78fdaa17d856c05bf1c8735':
show the dream enable switch in all conditions.
2012-09-26 13:21:24 -07:00
Chris Wren
99f98bb146
Merge "show the dream enable switch in all conditions." into jb-mr1-dev
2012-09-26 13:18:02 -07:00
Chris Wren
63707af94a
show the dream enable switch in all conditions.
...
Bug: 7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
2012-09-26 14:53:45 -04:00
Amith Yamasani
31ca3e44a4
am 1746d3a7: am 6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
...
* commit '1746d3a7346492a92ae1008eea33b26ffb8a1479':
Show more security settings, and fix missing summary in widget selection.
2012-09-26 11:51:57 -07:00
Amith Yamasani
6f2ca5bc71
Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev
2012-09-26 11:47:32 -07:00
John Spurlock
288bb7b144
am 0ebbd1d4: am d33caa4d: Dream settings now looks for the settings activity in xml.
...
* commit '0ebbd1d44f94ae093378f31b1812c8c45f7cb785':
Dream settings now looks for the settings activity in xml.
2012-09-26 11:21:55 -07:00
John Spurlock
8d83ff55bd
am fedb8a07: am 49dc9825: Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
...
* commit 'fedb8a078954cf7e9b4780f5cd90bd7f827d987a':
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
2012-09-26 10:07:25 -07:00
John Spurlock
d33caa4dea
Dream settings now looks for the settings activity in xml.
...
Uses the new api for obtaining dream metadata, no longer looks
for the settings activity using the old metadata key.
Bug:7172816
Change-Id: I5f9f9ea2a59df6a55c2f17bca5cdbe206f89d780
2012-09-26 12:40:54 -04:00
John Spurlock
49dc982556
Prepare settings for METADATA_NAME_CONFIG_ACTIVITY removal.
...
This is to avoid even a temporary build breakage. Using the new
xml file will be done in a followup commit.
Bug:7172816
Change-Id: If6fedefbee38428eda5b39994c3ad8ff86c8fef9
2012-09-26 11:16:34 -04:00
Amith Yamasani
7fb4f850ea
Show more security settings, and fix missing summary in widget selection.
...
Bug: 7232809
Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
2012-09-25 22:44:21 -07:00
Svetoslav Ganov
82a2de3562
am 6b77eb2d: am 12fda43f: Merge "Show long message for a new user only once." into jb-mr1-dev
...
* commit '6b77eb2d691e2ad476d66c3dfb8cb678c1ca2e1d':
Show long message for a new user only once.
2012-09-25 18:21:21 -07:00
Svetoslav Ganov
12fda43f85
Merge "Show long message for a new user only once." into jb-mr1-dev
2012-09-25 18:17:15 -07:00
Jeff Brown
9c29a3f981
am 8b9f0fda: am 209898da: Merge "Update references to migrated global settings." into jb-mr1-dev
...
* commit '8b9f0fda101426bfb275d3bb1a005781e58ce797':
Update references to migrated global settings.
2012-09-25 17:09:26 -07:00
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
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
cd207ad437
Merge "Fix regression in Bluetooth settings." into jb-mr1-dev
2012-09-25 16:24:59 -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
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
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
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
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
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
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
c939735b17
Merge "Addressing issue where power control widget disappears issue 7205586" into jb-mr1-dev
2012-09-24 11:49:24 -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
Romain Guy
9a38e484e7
am 4be0fe59: am 70edd393: Merge "Add new developer setting to visualize overdraw" into jb-mr1-dev
...
* commit '4be0fe59d9c9c61acc248464957dcd2e9f18abca':
Add new developer setting to visualize overdraw
2012-09-24 09:33:46 -07:00
Svetoslav Ganov
7253131c04
am dd381701: am f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev
...
* commit 'dd381701db67697ac8ccd5e2d01aeba2ff92cbcd':
Accessibility multi-user support.
2012-09-24 09:33:44 -07:00
Svetoslav Ganov
29dd06463a
am 1bd69f9a: am 0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev
...
* commit '1bd69f9abab775ec1aceee53153c3a7e5aa329ec':
Remove accessibility category from developer options.
2012-09-24 00:52:10 -07:00
Dianne Hackborn
d592ce2974
am 3fea2123: am f4bd1a70: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev
...
* commit '3fea2123960fd7d0f2d766f16a8bdb69e570355a':
Fix issue 7198767, 7198366, 7189824.
2012-09-24 00:52:04 -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