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

8521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
9e143f5e9d First draft of wifi display settings UI. 
All of the functionality is in place but the UI is
not fully polished yet.

Bug: 7178216
Change-Id: Id76843bff05cc71e5c02a31bc97c7070d58fff10
 2012-09-19 21:37:20 -07:00
Jeff Sharkey
99340f36cb Merge "Update string to reflect removed users." into jb-mr1-dev 2012-09-19 18:58:07 -07:00
Brian Muramatsu
801a1588d9 Merge "Fix regulatory information dialog appearance" into jb-mr1-dev 2012-09-19 15:40:56 -07:00
Jeff Sharkey
6bf72119fd Update string to reflect removed users. 
Bug: 7194784
Change-Id: Ied3b4376d0ad664c61a5d3388fe24bc96c6ee466
 2012-09-19 15:26:12 -07:00
Brian Muramatsu
be1f3d2db0 am 0bce702c: am 185ba407: Fix NPE in DeviceInfoSettings 
* commit '0bce702c5f1ea9369f85a1375e8dbc3cad540368':
  Fix NPE in DeviceInfoSettings
 2012-09-19 15:21:23 -07:00
Jeff Sharkey
79f3b7d8f5 am 2ae699c3: am 8882ccdd: Load user photos through system_server. 
* commit '2ae699c3740e5ca0d80bfde1dc6ec66ddd3f5138':
  Load user photos through system_server.
 2012-09-19 15:20:26 -07:00
Jeff Sharkey
27fcb666f5 am bcd519d2: am f5de1db2: Omit PPTP VPNs from lockdown list. 
* commit 'bcd519d20c0bb8b3f13aa209bbe6de443c15e262':
  Omit PPTP VPNs from lockdown list.
 2012-09-19 15:20:25 -07:00
Amith Yamasani
d1ae363761 am 6d17289e: am b92e9afe: Merge "Fix a crash in InstalledAppDetails" into jb-mr1-dev 
* commit '6d17289e778faa5c92fb7e54972e9d13be60aef9':
  Fix a crash in InstalledAppDetails
 2012-09-19 15:20:20 -07:00
Irfan Sheriff
ddd73b401e am 92484c85: am 9fc59c99: Merge "Fix strings" into jb-mr1-dev 
* commit '92484c85228f264d8b86820a10af81e2b67929f8':
  Fix strings
 2012-09-19 15:19:03 -07:00
Jeff Sharkey
ee9ecf0ac6 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 2012-09-19 14:52:34 -07:00
Brian Muramatsu
cb0a6ccba9 Fix NPE in DeviceInfoSettings 
Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
 2012-09-19 14:11:53 -07:00
Amith Yamasani
45410f3e85 Fix a crash in InstalledAppDetails 
Initialize mPackageInfo in onCreate

Bug: 7194755
Change-Id: Ic82351591bd38c4c161bbb23c4033038d1d7fa85
 2012-09-19 14:11:46 -07:00
Brian Muramatsu
0bce702c5f am 185ba407: Fix NPE in DeviceInfoSettings 
* commit '185ba407bab02c1442d02b82800f0220779ecb10':
  Fix NPE in DeviceInfoSettings
 2012-09-19 14:08:52 -07:00
Jeff Sharkey
4420246a20 Migrate UI to supportsMultipleUsers(). 
Bug: 7194531
Change-Id: I601340362053cfd7394dea0fa69bd0523303070b
 2012-09-19 13:13:45 -07:00
Brian Muramatsu
185ba407ba Fix NPE in DeviceInfoSettings 
Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
 2012-09-19 13:05:06 -07:00
Jeff Sharkey
2ae699c374 am 8882ccdd: Load user photos through system_server. 
* commit '8882ccdd3eafc338213b312f1b73fb4de1776a60':
  Load user photos through system_server.
 2012-09-19 11:23:50 -07:00
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
ab7024a5b0 am 9fc59c99: Merge "Fix strings" into jb-mr1-dev 
* commit '9fc59c99efc9413546aa4a60a740f617730a08b0':
  Fix strings
 2012-09-19 05:50:35 -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
16f41fa6af 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:31:39 -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
9699ec0b6d 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:13:31 -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
Jeff Sharkey
447e83f048 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:20:37 -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
3bbd460883 am a6c1b346: Merge "Add optional regulatory info page" into jb-mr1-dev 
* commit 'a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb':
  Add optional regulatory info page
 2012-09-18 15:14:40 -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
Adam Cohen
976931c1b9 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:59:44 -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