Jeff Sharkey
cd2c9950aa
am bc91baed
: am cc24aa2b
: Merge "Follow more Secure settings to Global." into jb-mr1-dev
...
* commit 'bc91baed620593df183f60ec835de6ca5d7f000a':
Follow more Secure settings to Global.
2012-09-28 00:36:36 -07:00
Wink Saville
98c7b4348f
am d1ebef09
: am b0873900
: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
...
* commit 'd1ebef0914830c3b2fc6479fc49b06c98811d4a5':
Fix an NPE in WifiSettings.
2012-09-28 00:36:14 -07:00
Amith Yamasani
7656d941da
am c295f9d3
: am 48af3cdb
: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
...
* commit 'c295f9d38e9575259120cd33866b87cd79f65826':
Rename "Owner info" to "User info" for secondary users
2012-09-28 00:35:15 -07:00
Russell Brenner
314ce581f7
am 6cd719c9
: am 2c84b9f2
: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
...
* commit '6cd719c9e84c2b6f726c6def128eed5fb9871fe9':
Move super call to top of onActivityCreated
2012-09-28 00:34:25 -07:00
Adam Cohen
e36e87cd32
am 6956e4b0
: am f4b6a682
: Merge "Addressing issue 7243210, can\'t set status widget properly" into jb-mr1-dev
...
* commit '6956e4b007a202a2ca6e81c224aada069d38fe5c':
Addressing issue 7243210, can't set status widget properly
2012-09-28 00:34:01 -07:00
Robert Greenwalt
57e1f4b859
am b02bc8e6
: am fffc9bef
: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev
...
* commit 'b02bc8e6a007f42a0404d386477fc8f2852845eb':
Precreate a data structure so it's never null.
2012-09-28 00:33:59 -07:00
Amith Yamasani
990c5f2432
Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev
2012-09-28 00:00:54 -07:00
rich cannings
4f64951cb8
Merge "Developer setting to skip Package Verification" into jb-mr1-dev
2012-09-27 23:11:50 -07:00
Amith Yamasani
1a634d32ac
Bring up new user setup dialog when tapping on new user
...
Bug: 7245796
Also fix a few strings that changed and other UI tweaks to conform
to spec document.
Change-Id: If4409459b20ec8c8ece69b6c23c8ab49b0ca0cac
2012-09-27 23:01:35 -07:00
Jeff Sharkey
cc24aa2b1f
Merge "Follow more Secure settings to Global." into jb-mr1-dev
2012-09-27 19:31:10 -07:00
Wink Saville
b08739003a
Merge "Fix an NPE in WifiSettings." into jb-mr1-dev
2012-09-27 18:14:45 -07:00
rich cannings
f04211443e
Developer setting to skip Package Verification
...
Add a developer setting to skip package verification when installing over
USB/ADB/ADT, but still perform package verification on all other installs.
This change also fixes visibility issues. Namely, now all "Verify apps"
related settings will disappear when
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0.
Bug: 7183252
Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
2012-09-27 17:15:46 -07:00
Jeff Sharkey
5246e7f76d
Follow more Secure settings to Global.
...
Bug: 7232014, 7231331, 7231198
Change-Id: Iea055cfa58edb253b55fe30bf294994ad338cfa4
2012-09-27 16:22:55 -07:00
Wink Saville
001e14a118
Fix an NPE in WifiSettings.
...
Under stressful conditions, like the Monkey tests, getActivity() can
return null. We assume this occurs when the fragment has shut down but
asynchronous commands are returning results. This change adds appropriate
null checks but assumes during normal operation the checks are not needed.
Bug: 7152711
Change-Id: I7a3736ccead33738dab1a36e78ae1d8042db6e94
2012-09-27 16:16:15 -07:00
Amith Yamasani
48af3cdbd9
Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
2012-09-27 16:06:49 -07:00
Russell Brenner
2c84b9f23c
Merge "Move super call to top of onActivityCreated" into jb-mr1-dev
2012-09-27 15:14:27 -07:00
Amith Yamasani
8666b9e170
Rename "Owner info" to "User info" for secondary users
...
Bug: 7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
2012-09-27 14:50:13 -07:00
Adam Cohen
f4b6a68215
Merge "Addressing issue 7243210, can't set status widget properly" into jb-mr1-dev
2012-09-27 13:14:17 -07:00
Robert Greenwalt
fffc9bef49
Merge "Precreate a data structure so it's never null." into jb-mr1-dev
2012-09-27 13:10:45 -07:00
Adam Cohen
eeb464ae43
Addressing issue 7243210, can't set status widget properly
...
Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
2012-09-27 13:04:00 -07:00
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