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

8318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
bd001f41f7 am a9ac2a46: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'a9ac2a46d1c718cfbe5e15bb1ad78217e236417f':
  Fix NPE in DeviceInfoSettings
  Fix a crash in InstalledAppDetails
  Tweaking mechanism for adding keyguard widgets
  Fix issue #7178865: Selecting an app from Settings > Apps>...
  Must initialize the new atomic..
  Fix crash in Settings > Security
 2012-09-20 12:49:00 -07:00
The Android Open Source Project
a9ac2a46d1 Reconcile with jb-mr1-release - do not merge 
Change-Id: I2692af987f16852c90fa0826367700862c6ea23b
 2012-09-20 10:37:00 -07:00
The Android Automerger
28cbc338b1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 07:00:29 -07:00
Jeff Brown
13d7c56a82 am cf0c0089: am 9e143f5e: First draft of wifi display settings UI. 
* commit 'cf0c0089c68b45d14e897cf86aecd781b07df049':
  First draft of wifi display settings UI.
 2012-09-20 06:18:45 -07:00
Jeff Sharkey
9bfcdaaf8c am b4923465: am 99340f36: Merge "Update string to reflect removed users." into jb-mr1-dev 
* commit 'b4923465f8397e16bf49f478853436c0641ed774':
  Update string to reflect removed users.
 2012-09-20 06:18:44 -07:00
Brian Muramatsu
bcbfba66c4 am 29200053: am 801a1588: Merge "Fix regulatory information dialog appearance" into jb-mr1-dev 
* commit '29200053d654d98a4f283da64b4e65e4a2364185':
  Fix regulatory information dialog appearance
 2012-09-20 06:18:42 -07:00
Jeff Sharkey
480d85678a am d975473a: am ee9ecf0a: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 
* commit 'd975473a9258b9f461930b0432a8e04c665a9f1f':
  Migrate UI to supportsMultipleUsers().
 2012-09-20 06:18:41 -07:00
Jeff Brown
cf0c0089c6 am 9e143f5e: First draft of wifi display settings UI. 
* commit '9e143f5e9d836d2d3dd0b2f59f7d14327ade0193':
  First draft of wifi display settings UI.
 2012-09-20 06:09:39 -07:00
Jeff Sharkey
b4923465f8 am 99340f36: Merge "Update string to reflect removed users." into jb-mr1-dev 
* commit '99340f36cb0ed7bf84b0bae418a85132a01acb32':
  Update string to reflect removed users.
 2012-09-20 06:08:57 -07:00
Brian Muramatsu
29200053d6 am 801a1588: Merge "Fix regulatory information dialog appearance" into jb-mr1-dev 
* commit '801a1588d91cbce758c50d6a5ddd35eba71c36b6':
  Fix regulatory information dialog appearance
 2012-09-20 06:08:00 -07:00
Jeff Sharkey
d975473a92 am ee9ecf0a: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 
* commit 'ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d':
  Migrate UI to supportsMultipleUsers().
 2012-09-20 06:07:29 -07:00
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
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