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

8241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
bcd519d20c am f5de1db2: Omit PPTP VPNs from lockdown list. 
* commit 'f5de1db28a61d159e62ef42f64a2cdcb316d0c2c':
  Omit PPTP VPNs from lockdown list.
 2012-09-19 11:23:49 -07:00
Amith Yamasani
6d17289e77 am b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev 
* commit 'b92e9afe4d056ca69a43450dc5be6ffb7efa1ea1':
  Fix a crash in InstalledAppDetails
 2012-09-19 11:16:52 -07:00
Jeff Sharkey
8882ccdd3e Load user photos through system_server. 
Bug: 7194137
Change-Id: Ie36ca40c48fb06d55d120bfcf3db69aea9d83829
 2012-09-19 11:16:24 -07:00
Jeff Sharkey
f5de1db28a Omit PPTP VPNs from lockdown list. 
Bug: 7064069
Change-Id: Ie4261828ef2dc5af32db3b327ca7ec00451e65d9
 2012-09-19 11:16:24 -07:00
Amith Yamasani
b92e9afe4d Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev 2012-09-19 11:14:46 -07:00
Amith Yamasani
b1bf9cf383 Fix a crash in InstalledAppDetails 
Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
 2012-09-19 10:58:32 -07:00
The Android Automerger
9b2997b817 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:01:47 -07:00
Irfan Sheriff
92484c8522 am 9fc59c99: Merge "Fix strings" into jb-mr1-dev 
* commit '9fc59c99efc9413546aa4a60a740f617730a08b0':
  Fix strings
 2012-09-18 22:04:55 -07:00
Irfan Sheriff
9fc59c99ef Merge "Fix strings" into jb-mr1-dev 2012-09-18 22:03:13 -07:00
Brian Muramatsu
b585c62811 Fix regulatory information dialog appearance 
Bug 7081675

Replace RegulatoryInfoFragment with a custom preference so that the info
shows up properly in a dialog. DialogFragments do not appear
as dialogs when instantiated from preference XML files.

Change-Id: Icbdf73bd5b1d14f28a01d7b9cb0f37d90340eb46
 2012-09-18 21:58:05 -07:00
Irfan Sheriff
fb6faab59e Fix strings 
Bug: 7182012
Bug: 7071211
Change-Id: I34aa508d5e4151ffdc538a3ab9ae1ddf3749b345
 2012-09-18 21:03:42 -07:00
Andy Stadler
a70720378c am eaec8255: am 27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev 
* commit 'eaec8255584a0f551c7fd463c5c37179d926f250':
  Rename file to satisfy strict Java requirement
 2012-09-18 17:16:34 -07:00
Michael Jurka
80200d84d7 am 2be38ba7: am dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev 
* commit '2be38ba7c1af98f2a4d5de7175bd62ca4a559a35':
  Fix bug: allow users to select "none" for lockscreen widget
 2012-09-18 17:16:33 -07:00
Andy Stadler
eaec825558 am 27f155a4: Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev 
* commit '27f155a4012aece82d58f7142960aec6414ade4d':
  Rename file to satisfy strict Java requirement
 2012-09-18 16:54:51 -07:00
Michael Jurka
2be38ba7c1 am dddef157: Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev 
* commit 'dddef157b79818cb20321e2a3b715e88457fba44':
  Fix bug: allow users to select "none" for lockscreen widget
 2012-09-18 16:54:43 -07:00
Adam Cohen
352c901765 Tweaking mechanism for adding keyguard widgets 
-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

Conflicts:

	src/com/android/settings/SecuritySettings.java
 2012-09-18 16:37:52 -07:00
Andy Stadler
27f155a401 Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev 2012-09-18 16:26:19 -07:00
Michael Jurka
dddef157b7 Merge "Fix bug: allow users to select "none" for lockscreen widget" into jb-mr1-dev 2012-09-18 16:11:30 -07:00
Jeff Sharkey
2817080c3a am c2bb090a: am 220b06b1: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev 
* commit 'c2bb090a523964c76040874186706906fab29354':
  Always show auto-sync; user-specific storage.
 2012-09-18 15:33:40 -07:00
Brian Muramatsu
8c13eafde6 am 61d698f5: am a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev 
* commit '61d698f5fbf839b7a3d4c4bb4ff68be3e962984d':
  Add optional regulatory info page
 2012-09-18 15:33:34 -07:00
Jeff Sharkey
c2bb090a52 am 220b06b1: Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev 
* commit '220b06b1bb8cb2ac947f7fe6b911b8160f1186cd':
  Always show auto-sync; user-specific storage.
 2012-09-18 15:23:33 -07:00
Michael Jurka
74dffa1bd5 Fix bug: allow users to select "none" for lockscreen widget 
Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc
 2012-09-18 15:17:58 -07:00
Jeff Sharkey
220b06b1bb Merge "Always show auto-sync; user-specific storage." into jb-mr1-dev 2012-09-18 15:15:31 -07:00
Brian Muramatsu
61d698f5fb am a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev 
* commit 'a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb':
  Add optional regulatory info page
 2012-09-18 15:14:31 -07:00
Jeff Sharkey
fda48e39d3 Always show auto-sync; user-specific storage. 
Auto-sync is per-user, so show it to all users.  Also create user-
specific path when showing misc storage items.

Bug: 7179485, 7177335
Change-Id: I9f6029e22d519a5516a0f1a76e6aa55db3c2832c
 2012-09-18 15:09:35 -07:00
Brian Muramatsu
a6c1b346ae Merge "Add optional regulatory info page" into jb-mr1-dev 2012-09-18 14:59:36 -07:00
Adam Cohen
1003b5b14c am 2a111678: am 7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev 
* commit '2a1116788636175fa4e502a4e6102cf71f8c8dba':
  Tweaking mechanism for adding keyguard widgets
 2012-09-18 14:58:46 -07:00
Dianne Hackborn
9706ccab84 am d9c029f8: am 9ba3d227: Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev 
* commit 'd9c029f8372057d14d52fee5e6e842926b8c3b6f':
  Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...
 2012-09-18 14:54:11 -07:00
Adam Cohen
2a11167886 am 7956e726: Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev 
* commit '7956e7263afd2007dc4262dc3c79dc74b14e8bf6':
  Tweaking mechanism for adding keyguard widgets
 2012-09-18 14:54:09 -07:00
Dianne Hackborn
d9c029f837 am 9ba3d227: Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev 
* commit '9ba3d227e37b49412fe146b43f15aabb1da0d008':
  Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails...
 2012-09-18 14:51:45 -07:00
Adam Cohen
7956e7263a Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev 2012-09-18 14:47:09 -07:00
Andy Stadler
1490075dff Rename file to satisfy strict Java requirement 
There is no code change, the classname is OK, it was just the
filename that needed a tweak.

Original code was Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4

Change-Id: I14f2009cff186647a736b1183acf815713234dd5
 2012-09-18 14:43:42 -07:00
Adam Cohen
1dd0024327 Tweaking mechanism for adding keyguard widgets 
-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885
 2012-09-18 14:41:47 -07:00
Dianne Hackborn
682298bc34 Fix issue #7178865: Selecting an app from Settings > Apps>... 
...all crashes on a secondary user

Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986
 2012-09-18 14:28:58 -07:00
Dianne Hackborn
9ba3d227e3 Merge "Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails..." into jb-mr1-dev 2012-09-18 14:19:28 -07:00
Dianne Hackborn
9fae74f6c3 Fix issue #7050530: NPE in Settings : settings.applications.RunningServiceDetails... 
...addDetailViews(RunningServiceDetails.java:439)

Change-Id: Id4a110bacf4da1bec07272b3b75e8bf0986cab92
 2012-09-18 14:17:36 -07:00
Michael Jurka
1fe9f6b19f am 71e7bd69: am 221e4356: Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev 
* commit '71e7bd696f103493e7c0fb25305494eededbe936':
  Fix cases where app widget ids were not being cleaned up
 2012-09-18 13:29:43 -07:00
Michael Jurka
71e7bd696f am 221e4356: Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev 
* commit '221e4356e1cbf24dd32037800601df91c3b85c6d':
  Fix cases where app widget ids were not being cleaned up
 2012-09-18 13:27:25 -07:00
Michael Jurka
221e4356e1 Merge "Fix cases where app widget ids were not being cleaned up" into jb-mr1-dev 2012-09-18 13:25:57 -07:00
Dianne Hackborn
478c95e74d am 09707bec: am ba088af9: Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev 
* commit '09707bec1e0a3781de92f308a0146679c19cb716':
  Fix issue #7178865: Selecting an app from Settings > Apps>...
 2012-09-18 12:27:42 -07:00
Dianne Hackborn
09707bec1e am ba088af9: Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev 
* commit 'ba088af9af1d874adebf78273432d0f079960249':
  Fix issue #7178865: Selecting an app from Settings > Apps>...
 2012-09-18 12:15:28 -07:00
Dianne Hackborn
ba088af9af Merge "Fix issue #7178865: Selecting an app from Settings > Apps>..." into jb-mr1-dev 2012-09-18 12:07:20 -07:00
Dianne Hackborn
0fca4296ac Fix issue #7178865: Selecting an app from Settings > Apps>... 
...all crashes on a secondary user

Change-Id: I977932bce3ea2816e4c9d1002488b658a96e3986
 2012-09-18 12:04:00 -07:00
Brian Muramatsu
a6dbaea2da Add optional regulatory info page 
Bug 7081675

If R.bools.config_show_regulatory_info is true, then show a "Regulatory
information" item on the "About phone" page. Show a DialogFragment
displaying the regulatory_info drawable if the item is clicked. Add a
1x1 blank regulatory_info drawable for devices that won't show this.

Change-Id: I5823d8969de038becf4911dce893dab5dbb23537
 2012-09-18 11:46:35 -07:00
Amith Yamasani
5ab37a421b am 0a072906: am 3e3b75f2: Merge "Add help menu for Users and Location access" into jb-mr1-dev 
* commit '0a0729063d6a81a93377d7c086da834bcec9148d':
  Add help menu for Users and Location access
 2012-09-18 10:14:11 -07:00
Baligh Uddin
2ce34cdc19 am eba53953: (-s ours) am 05bf34c2: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit 'eba539531c4845e001c0d370887a69d8e901bdca':
  Revert "Import translations. DO NOT MERGE"
 2012-09-18 10:14:10 -07:00
Baligh Uddin
700b7e86cb am 490ab8a6: (-s ours) am fa69d3ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '490ab8a6fb2f5b5fe379b214cf9959acba96a71b':
  Import translations. DO NOT MERGE
 2012-09-18 10:14:08 -07:00
Amith Yamasani
0a0729063d am 3e3b75f2: Merge "Add help menu for Users and Location access" into jb-mr1-dev 
* commit '3e3b75f26f2ad91c40ba28d13af2838331113bca':
  Add help menu for Users and Location access
 2012-09-18 10:10:41 -07:00
Baligh Uddin
eba539531c am 05bf34c2: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '05bf34c2559a8d800da18eabeb0214f559d4aeef':
  Revert "Import translations. DO NOT MERGE"
 2012-09-18 10:10:06 -07:00
Baligh Uddin
490ab8a6fb am fa69d3ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fa69d3ed7518f81e6f6040fc4dbc5d5b479bcb2d':
  Import translations. DO NOT MERGE
 2012-09-18 10:10:03 -07:00