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

8493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dianne Hackborn
1bbc2eff36 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:49:51 -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
b439af8e78 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 14:03:44 -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
06d2e94973 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:17:00 -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
45c18afa5c 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:44:10 -07:00
Baligh Uddin
b4fabb93a9 am 05bf34c2: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '05bf34c2559a8d800da18eabeb0214f559d4aeef':
  Revert "Import translations. DO NOT MERGE"
 2012-09-18 10:03:29 -07:00
Baligh Uddin
5085333d7e am fa69d3ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fa69d3ed7518f81e6f6040fc4dbc5d5b479bcb2d':
  Import translations. DO NOT MERGE
 2012-09-18 10:03:26 -07:00
Amith Yamasani
3e3b75f26f Merge "Add help menu for Users and Location access" into jb-mr1-dev 2012-09-18 09:55:21 -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
Baligh Uddin
05bf34c255 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-09-18 07:24:53 -07:00
Baligh Uddin
23bc9fa844 Revert "Import translations. DO NOT MERGE" 
Broke the build.

This reverts commit b4b2857236

Change-Id: I51f5f569d717bf0973e5e5a868e9fdc53ca80f99
 2012-09-18 07:24:16 -07:00
Baligh Uddin
fa69d3ed75 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-18 07:03:37 -07:00
Amith Yamasani
130e9ab161 am 766a0683: Merge "Use Bitmap instead of ParcelFileDescriptor to get the user\'s icon." into jb-mr1-dev 
* commit '766a0683cf2dda8fb3dee51fcd2111d6ce81e774':
  Use Bitmap instead of ParcelFileDescriptor to get the user's icon.
 2012-09-17 22:54:53 -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
02d303835f am b9e1ff15: Merge "Add flag to allow testing launcher widgets in keyguard." into jb-mr1-dev 
* commit 'b9e1ff15f5483513fc8ab8026cc461e9f97d5e73':
  Add flag to allow testing launcher widgets in keyguard.
 2012-09-17 22:32:00 -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
Amith Yamasani
b0422f6a9f am 64c6ee20: Merge "Use UserManager.getUserIcon() to get the user\'s avatar." into jb-mr1-dev 
* commit '64c6ee20bae6cbf868ec4a0a3ffc7ce6fd10bdd6':
  Use UserManager.getUserIcon() to get the user's avatar.
 2012-09-17 18:37:28 -07:00
Amith Yamasani
64c6ee20ba Merge "Use UserManager.getUserIcon() to get the user's avatar." into jb-mr1-dev 2012-09-17 18:34:34 -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
Baligh Uddin
b4b2857236 Import translations. DO NOT MERGE 
Change-Id: I4bbb7366b1791f33b685903e419dfee6ffcbc2f8
Auto-generated-cl: translation import
 2012-09-17 15:27:01 -07:00
Amith Yamasani
e940dac47a Use UserManager.getUserIcon() to get the user's avatar. 
Change-Id: I035a5e2a518eb827a2e44910471ed04923921aa3
 2012-09-17 12:39:41 -07:00
Baligh Uddin
acd9fbf534 am d0d925d9: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit 'd0d925d96bf0c532cec203fdd2cb35464d247ad5':
  Revert "Import translations. DO NOT MERGE"
 2012-09-17 10:24:19 -07:00
Baligh Uddin
d0d925d96b Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-09-17 10:21:21 -07:00
Baligh Uddin
ab644d689d Revert "Import translations. DO NOT MERGE" 
Build Broken.

This reverts commit 4a44ed7bd7

Change-Id: Ie61c8d7b1e5eb46fe8aed1836f8d63f989d23db4
 2012-09-17 10:18:44 -07:00
Baligh Uddin
f73560a7e0 am 0cbc30f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0cbc30f0b7da22454d1fdc57851f316adbf6aa09':
  Import translations. DO NOT MERGE
 2012-09-17 10:02:24 -07:00
Baligh Uddin
0cbc30f0b7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-17 10:00:39 -07:00