Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,200 Commits 1 Branch 0 Tags
7253131c048800e691d87e94d8a435b0726d0ef8
Commit Graph

3750 Commits

Author SHA1 Message Date
Svetoslav Ganov
7253131c04 am dd381701: am f85e7e15: Merge "Accessibility multi-user support." into jb-mr1-dev 
* commit 'dd381701db67697ac8ccd5e2d01aeba2ff92cbcd':
  Accessibility multi-user support.
 2012-09-24 09:33:44 -07:00
Svetoslav Ganov
29dd06463a am 1bd69f9a: am 0a48c169: Merge "Remove accessibility category from developer options." into jb-mr1-dev 
* commit '1bd69f9abab775ec1aceee53153c3a7e5aa329ec':
  Remove accessibility category from developer options.
 2012-09-24 00:52:10 -07:00
Dianne Hackborn
d592ce2974 am 3fea2123: am f4bd1a70: Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev 
* commit '3fea2123960fd7d0f2d766f16a8bdb69e570355a':
  Fix issue 7198767, 7198366, 7189824.
 2012-09-24 00:52:04 -07:00
Svetoslav Ganov
f85e7e15a7 Merge "Accessibility multi-user support." into jb-mr1-dev 2012-09-21 17:41:31 -07:00
Svetoslav Ganov
46045d8b12 Accessibility multi-user support. 
1. Accessibility settings are now shown for every user.

bug:6967373

Change-Id: Ie31a6a573031bde1d769e43c4d5d88b7e4c8525d
 2012-09-21 17:25:46 -07:00
Svetoslav Ganov
0a48c1690b Merge "Remove accessibility category from developer options." into jb-mr1-dev 2012-09-21 17:12:08 -07:00
Dianne Hackborn
f4bd1a705f Merge "Fix issue 7198767, 7198366, 7189824." into jb-mr1-dev 2012-09-21 17:05:23 -07:00
Dianne Hackborn
c715fb1207 Fix issue 7198767, 7198366, 7189824. 
Bug #7198767: Crash on choosing App info from the Recent apps tab
Bug #7198366: Settings UI should not show other Users' apps
Bug #7189824: Settings crashes on trying to access Battery usage summary

Also fix running services to be able to show user bitmap when in
secondary users, crash in running services if a service is running
whose app is not installed for the current user.

Change-Id: Ief24810c9ddce1ec3f8641ce08af79e1bc18f221
 2012-09-21 17:02:22 -07:00
Michael Jurka
f66c3603fe am cbf5be09: am 406b01f4: Merge "Add support for changing status widget on security screen" into jb-mr1-dev 
* commit 'cbf5be09b072a7caa7558a30cfdf5cf1d584dc84':
  Add support for changing status widget on security screen
 2012-09-21 01:15:29 -07:00
Michael Jurka
406b01f4ff Merge "Add support for changing status widget on security screen" into jb-mr1-dev 2012-09-21 01:11:00 -07:00
Michael Jurka
091477b4de Add support for changing status widget on security screen 
Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
 2012-09-21 01:01:39 -07:00
Amith Yamasani
816ef1db92 am 10e59b1c: am e4f249bb: Merge "Exclude dying users when querying the list" into jb-mr1-dev 
* commit '10e59b1c6e4d381d5ea8f653ab191eb41d31c026':
  Exclude dying users when querying the list
 2012-09-20 23:13:18 -07:00
Amith Yamasani
e278eda851 Exclude dying users when querying the list 
Bug: 7194894

Use the new API in UserManager to query the list of users, excluding
the dying ones.

Change-Id: Ib09bb723209030da7e8aca53d402ef4c96c273a3
 2012-09-20 22:44:48 -07:00
Svetoslav Ganov
43af40be48 Remove accessibility category from developer options. 
1. There is a temporary accessibility option in developer options with
   one item for enabling automatic zoom out and panning. This is not a
   developer option in general and should not be there.

bug:7207305

Change-Id: Ib146ccb3704dd94d635cc668b71c007fbd8d29b3
 2012-09-20 19:15:33 -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
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
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
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
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
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
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
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
7956e7263a Merge "Tweaking mechanism for adding keyguard widgets" into jb-mr1-dev 2012-09-18 14:47:09 -07:00