PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,802 Commits 1 Branch 0 Tags
d3a3bfd598ba21a43db7e5e66c90a98d028aa22c
Commit Graph

8802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
ebc3ef24be am b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev 
* commit 'b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
  Fix an NPE in WifiSettings.
 2012-09-27 18:16:22 -07:00
Wink Saville
d1ebef0914 am b0873900: Merge "Fix an NPE in WifiSettings." into jb-mr1-dev 
* commit 'b08739003aa2cbc4dfe650f6badda8cfe2be1e76':
  Fix an NPE in WifiSettings.
 2012-09-27 18:16:04 -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
43928065ee am 48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev 
* commit '48af3cdbd934b79ebbcd4639bb63621e93ca9ec2':
  Rename "Owner info" to "User info" for secondary users
 2012-09-27 16:08:54 -07:00
Amith Yamasani
c295f9d38e am 48af3cdb: Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev 
* commit '48af3cdbd934b79ebbcd4639bb63621e93ca9ec2':
  Rename "Owner info" to "User info" for secondary users
 2012-09-27 16:08:39 -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
f65b675291 am 2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev 
* commit '2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
  Move super call to top of onActivityCreated
 2012-09-27 15:17:07 -07:00
Russell Brenner
6cd719c9e8 am 2c84b9f2: Merge "Move super call to top of onActivityCreated" into jb-mr1-dev 
* commit '2c84b9f23c1bf345478bce7a2955ac309e32fe6d':
  Move super call to top of onActivityCreated
 2012-09-27 15:16:56 -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
e11385a886 am f4b6a682: Merge "Addressing issue 7243210, can\'t set status widget properly" into jb-mr1-dev 
* commit 'f4b6a68215a0269837b73f134ff57cf150bc1d9c':
  Addressing issue 7243210, can't set status widget properly
 2012-09-27 13:16:59 -07:00
Adam Cohen
6956e4b007 am f4b6a682: Merge "Addressing issue 7243210, can\'t set status widget properly" into jb-mr1-dev 
* commit 'f4b6a68215a0269837b73f134ff57cf150bc1d9c':
  Addressing issue 7243210, can't set status widget properly
 2012-09-27 13:16:36 -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
b02bc8e6a0 am fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev 
* commit 'fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
  Precreate a data structure so it's never null.
 2012-09-27 13:12:57 -07:00
Robert Greenwalt
16f6dd8d5a am fffc9bef: Merge "Precreate a data structure so it\'s never null." into jb-mr1-dev 
* commit 'fffc9bef49428ac4974ed5c1ee2e4d0c0f9d4a5a':
  Precreate a data structure so it's never null.
 2012-09-27 13:12:07 -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
Baligh Uddin
e5c6790f86 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-27 10:09:06 -07:00
Baligh Uddin
e086fd98ba am bfb5fa9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bfb5fa9ec37d58101febd13a334707f8f7e341f5':
  Import translations. DO NOT MERGE
 2012-09-27 10:06:09 -07:00
Baligh Uddin
6238559ebb am bfb5fa9e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bfb5fa9ec37d58101febd13a334707f8f7e341f5':
  Import translations. DO NOT MERGE
 2012-09-27 10:05:42 -07:00
Baligh Uddin
bfb5fa9ec3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-27 10:03:48 -07:00
The Android Open Source Project
fca2ad6dfa Reconcile with jb-mr1-release - do not merge 
Change-Id: I760c1f8381bb21e4f5f3b492b18a0e6d27dd531a
 2012-09-27 09:59:34 -07:00
The Android Automerger
a6ab0bd5e8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 07:00:27 -07:00
Amith Yamasani
f7f8b8a2ca am 04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev 
* commit '04c4ec607affecc16e3032327288f890bddad3db':
  Show warning dialog in a multiuser system when adding a new account.
 2012-09-26 22:03:10 -07:00
Amith Yamasani
0c3900af38 am 04c4ec60: Merge "Show warning dialog in a multiuser system when adding a new account." into jb-mr1-dev 
* commit '04c4ec607affecc16e3032327288f890bddad3db':
  Show warning dialog in a multiuser system when adding a new account.
 2012-09-26 22:02:48 -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
69b475eeee am 3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev 
* commit '3db14139205d762ccf544c20ee2b4a04dd4de0da':
  Clean up Global settings stragglers.
 2012-09-26 20:17:19 -07:00
Jeff Sharkey
2a6668aff0 am 3db14139: Merge "Clean up Global settings stragglers." into jb-mr1-dev 
* commit '3db14139205d762ccf544c20ee2b4a04dd4de0da':
  Clean up Global settings stragglers.
 2012-09-26 20:16:54 -07:00
Jeff Sharkey
3db1413920 Merge "Clean up Global settings stragglers." into jb-mr1-dev 2012-09-26 20:15:20 -07:00
Baligh Uddin
a9731af829 Import translations. DO NOT MERGE 
Change-Id: Ibdc7730e6559d27b4c9abd2e3cec90f2a0d97a76
Auto-generated-cl: translation import
 2012-09-26 18:51:25 -07:00
Baligh Uddin
53502e0731 Import translations. DO NOT MERGE 
Change-Id: I9380681436e70cd7e9680b32f5e82974cc35bd7a
Auto-generated-cl: translation import
 2012-09-26 18:49:52 -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
45bcaa0228 am 74c1d328: Avoid using hardcoded strings. 
* commit '74c1d328e2e75265a2b106ef66618cf1eb60c914':
  Avoid using hardcoded strings.
 2012-09-26 17:28:54 -07:00
Jeff Brown
4daf2f42a9 am 74c1d328: Avoid using hardcoded strings. 
* commit '74c1d328e2e75265a2b106ef66618cf1eb60c914':
  Avoid using hardcoded strings.
 2012-09-26 17:28:50 -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
331640d1ec am 99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev 
* commit '99f98bb14607240a0e05997a18770912ade1587e':
  show the dream enable switch in all conditions.
 2012-09-26 13:20:00 -07:00
Chris Wren
b402c81a21 am 99f98bb1: Merge "show the dream enable switch in all conditions." into jb-mr1-dev 
* commit '99f98bb14607240a0e05997a18770912ade1587e':
  show the dream enable switch in all conditions.
 2012-09-26 13:19:53 -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
1746d3a734 am 6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev 
* commit '6f2ca5bc71d9afc531b60762b8676cacdb96fcaa':
  Show more security settings, and fix missing summary in widget selection.
 2012-09-26 11:50:14 -07:00
Amith Yamasani
c78ee4b606 am 6f2ca5bc: Merge "Show more security settings, and fix missing summary in widget selection." into jb-mr1-dev 
* commit '6f2ca5bc71d9afc531b60762b8676cacdb96fcaa':
  Show more security settings, and fix missing summary in widget selection.
 2012-09-26 11:49:15 -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
0ebbd1d44f am d33caa4d: Dream settings now looks for the settings activity in xml. 
* commit 'd33caa4dea521677431f86e719ac1df290a24c69':
  Dream settings now looks for the settings activity in xml.
 2012-09-26 11:19:57 -07:00
John Spurlock
930d219d71 am d33caa4d: Dream settings now looks for the settings activity in xml. 
* commit 'd33caa4dea521677431f86e719ac1df290a24c69':
  Dream settings now looks for the settings activity in xml.
 2012-09-26 11:19:37 -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