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

3728 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Amith Yamasani
38223dc458 Add help menu for Users and Location access 
Bug: 7093415
Bug: 7130812
Change-Id: I44c68e846dcc5d98fc8b152f79d75140e151323a
 2012-09-18 09:51:07 -07:00
Amith Yamasani
2a27fce5a4 am effc3ce9: am 766a0683: Merge "Use Bitmap instead of ParcelFileDescriptor to get the user\'s icon." into jb-mr1-dev 
* commit 'effc3ce9dd59e9ca20096f9c4183cadcb5957854':
  Use Bitmap instead of ParcelFileDescriptor to get the user's icon.
 2012-09-18 00:09:13 -07:00
Jim Miller
9ee46b1bf0 am 46ed7322: am b9e1ff15: Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev 
* commit '46ed732203cc8e257ad86d8ed774815edb4996c8':
  Add flag to allow testing launcher widgets in keyguard.
 2012-09-18 00:09:12 -07:00
Amith Yamasani
a9f4ca2f39 am f4822081: am 64c6ee20: Merge "Use UserManager.getUserIcon() to get the user\'s avatar." into jb-mr1-dev 
* commit 'f4822081e3097bdc85d548b192bf52f9cec012e7':
  Use UserManager.getUserIcon() to get the user's avatar.
 2012-09-18 00:09:10 -07:00
Amith Yamasani
766a0683cf Merge "Use Bitmap instead of ParcelFileDescriptor to get the user's icon." into jb-mr1-dev 2012-09-17 22:53:37 -07:00
Amith Yamasani
f34a85d5d5 Use Bitmap instead of ParcelFileDescriptor to get the user's icon. 
Change-Id: I1dd7261b47ba98a2a0834dbfb8c22de369e6cc58
 2012-09-17 22:47:37 -07:00
Jim Miller
b9e1ff15f5 Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev 2012-09-17 22:30:07 -07:00
Jim Miller
f8f6217f96 Add flag to allow testing launcher widgets in keyguard. 
Change-Id: I10fc3f6557dba9261b898d7b123d1391c1afdf06
 2012-09-17 21:02:25 -07:00
Michael Jurka
3028051ba8 Fix cases where app widget ids were not being cleaned up 
Change-Id: Ie3f1ba0cc0fe459ae9fff2665c2ff4aa76e95994
 2012-09-17 17:56:37 -07:00
Robert Greenwalt
932f86c916 am 5c2c39c3: am bdb9fc86: Merge "Must initialize the new atomic.." into jb-mr1-dev 
* commit '5c2c39c3e10ce1115ab8530f23c09fa73a251ab3':
  Must initialize the new atomic..
 2012-09-17 14:46:21 -07:00
Amith Yamasani
d7fbecc647 am 1921b442: am 582ab169: Merge "More user management ui work" into jb-mr1-dev 
* commit '1921b442ab47041592bc7b4a81f5bcedda120ddf':
  More user management ui work
 2012-09-17 14:46:15 -07:00