PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,474 Commits 1 Branch 0 Tags
db922ac69186b4b0e44b0ef03589b4fb92b51ab2
Commit Graph

9474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Brenner
88c9f2889f Show warnings when skipping Wi-Fi connection 
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.

Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.

Bug: 7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
 2012-09-28 10:51:31 -07:00
The Android Automerger
a70c5e1b6a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-28 06:59:56 -07:00
Amith Yamasani
27b9ec937a am 550c8f2b: am 990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev 
* commit '550c8f2bfd9fae5e1c140a30bc92f7afd69122db':
  Bring up new user setup dialog when tapping on new user
 2012-09-28 00:38:31 -07:00
Baligh Uddin
a51e1b9978 am b15c5ee2: (-s ours) am ec4a1520: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b15c5ee284d9a81c75fb8f741986834797a334ec':
  Import translations. DO NOT MERGE
 2012-09-28 00:38:25 -07:00
rich cannings
6fb31c87d2 am d4d78dc4: am 4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev 
* commit 'd4d78dc4e3e19fab49f954e393f12ad05def494c':
  Developer setting to skip Package Verification
 2012-09-28 00:38:07 -07:00
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
Baligh Uddin
14e942fc8c am 6238559e: (-s ours) am bfb5fa9e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6238559ebb0f922aa461739e1ae8a6f5fd57e9cc':
  Import translations. DO NOT MERGE
 2012-09-28 00:33:03 -07:00
The Android Open Source Project
70b4532d52 am fca2ad6d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'fca2ad6dfa28253e859ff9cfe4c2c80229d71a89':
 2012-09-28 00:32:54 -07:00
Amith Yamasani
e6f4a99ae7 am 990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev 
* commit '990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
  Bring up new user setup dialog when tapping on new user
 2012-09-28 00:03:09 -07:00
Amith Yamasani
550c8f2bfd am 990c5f24: Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev 
* commit '990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c':
  Bring up new user setup dialog when tapping on new user
 2012-09-28 00:02:54 -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
Baligh Uddin
5ce059f9a0 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-27 23:49:03 -07:00
Baligh Uddin
b15c5ee284 am ec4a1520: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ec4a152071fb9e3dcdf00eec2444afc6df800540':
  Import translations. DO NOT MERGE
 2012-09-27 23:44:46 -07:00
Baligh Uddin
c5776665dd am ec4a1520: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'ec4a152071fb9e3dcdf00eec2444afc6df800540':
  Import translations. DO NOT MERGE
 2012-09-27 23:44:42 -07:00
Baligh Uddin
a0e0c039bf Import translations. DO NOT MERGE 
Change-Id: I671c42c1630ec9692d14e0e588e303254c67386d
Auto-generated-cl: translation import
 2012-09-27 23:42:39 -07:00
Baligh Uddin
ec4a152071 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-27 23:41:51 -07:00
Baligh Uddin
284dce73ae Import translations. DO NOT MERGE 
Change-Id: Ifc3aa0738b4f2beccdc05c1c225ff60308def5d4
Auto-generated-cl: translation import
 2012-09-27 23:40:16 -07:00
Baligh Uddin
7ba9c3b5b1 Import translations. DO NOT MERGE 
Change-Id: I38fbd0c22b6056e9c089425511481e6c4b1dacac
Auto-generated-cl: translation import
 2012-09-27 23:38:37 -07:00
rich cannings
c155e051eb am 4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev 
* commit '4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
  Developer setting to skip Package Verification
 2012-09-27 23:13:57 -07:00
rich cannings
d4d78dc4e3 am 4f64951c: Merge "Developer setting to skip Package Verification" into jb-mr1-dev 
* commit '4f64951cb89c5da82fdbba3c02bccf0f3500c2a7':
  Developer setting to skip Package Verification
 2012-09-27 23:13:19 -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
bc91baed62 am cc24aa2b: Merge "Follow more Secure settings to Global." into jb-mr1-dev 
* commit 'cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
  Follow more Secure settings to Global.
 2012-09-27 19:33:35 -07:00
Jeff Sharkey
ed1b291c47 am cc24aa2b: Merge "Follow more Secure settings to Global." into jb-mr1-dev 
* commit 'cc24aa2b1f58236867a4e0c326e5ce4197df55d8':
  Follow more Secure settings to Global.
 2012-09-27 19:32:54 -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
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