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

8243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
eba539531c am 05bf34c2: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '05bf34c2559a8d800da18eabeb0214f559d4aeef':
  Revert "Import translations. DO NOT MERGE"
 2012-09-18 10:10:06 -07:00
Baligh Uddin
490ab8a6fb am fa69d3ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fa69d3ed7518f81e6f6040fc4dbc5d5b479bcb2d':
  Import translations. DO NOT MERGE
 2012-09-18 10:10:03 -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
The Android Automerger
76ab476c11 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-18 07:00:19 -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
effc3ce9dd 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-18 00:05:16 -07:00
Jim Miller
46ed732203 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-18 00:05:07 -07:00
Amith Yamasani
f4822081e3 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-18 00:04:22 -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
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
Baligh Uddin
125010cd16 am 27a6c5a1: (-s ours) am d0d925d9: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit '27a6c5a19215f666c91b92bbb2dedab5b2f48044':
  Revert "Import translations. DO NOT MERGE"
 2012-09-17 14:53:17 -07:00
Baligh Uddin
4378df5810 am 612cafa0: (-s ours) am 0cbc30f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '612cafa05657d3b8e52d39a48e231db61b9ded3f':
  Import translations. DO NOT MERGE
 2012-09-17 14:53:05 -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
Dianne Hackborn
b1d9cc6bdb am b53618d9: am 3db54cb9: Add app details menu item to uninstall an app for all users. 
* commit 'b53618d90656b877c3452c91bc740e8cf94029eb':
  Add app details menu item to uninstall an app for all users.
 2012-09-17 14:46:00 -07:00
rich cannings
1cec70a149 am 3135f66e: am d41fd604: Merge "Ability to hide verification settings" into jb-mr1-dev 
* commit '3135f66e87dcd0863fa9e081dbf7d097e84fe1f7':
  Ability to hide verification settings
 2012-09-17 14:45:12 -07:00
John Huang
017aa2c1d7 am 7e2a1c2e: am 70c6e0fb: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 
* commit '7e2a1c2e89b236ad12f030037af2efe08d52bcc5':
  Add support for per-package policy for sending premium SMS.
 2012-09-17 14:44:46 -07:00
Svetoslav Ganov
08c51c0b47 am 1fb5be15: am 260d930e: Merge "Updating the screen magnification description." into jb-mr1-dev 
* commit '1fb5be15656a46566b5efb168075ec3200cfaa1e':
  Updating the screen magnification description.
 2012-09-17 14:44:45 -07:00
Kenny Root
67a8e43f07 am 835e0cb7: am cf008c28: Do not allow non-primary user to install certs 
* commit '835e0cb7087f049d25b08b820088a5c40bc0932f':
  Do not allow non-primary user to install certs
 2012-09-17 14:44:43 -07:00
Robert Greenwalt
5a72c6733d Must initialize the new atomic.. 
bug:7172859
Change-Id: Ibaf390683fa36771215b463fb6b088f7430c0462
 2012-09-17 13:52:12 -07:00
Jeff Sharkey
ef33003086 am a8dbb9b8: am 38305fb1: Data usage multi-user support. 
* commit 'a8dbb9b8e46d90f77617f343f3ccab7d9109c116':
  Data usage multi-user support.
 2012-09-17 12:46:34 -07:00
rich cannings
bfa313cc6e am 70b37e77: am b2f4efb7: Correct strings for Plaform Anti-malware 
* commit '70b37e77c7c885f3a828fe6fbe5ebf8ebf3ca2ce':
  Correct strings for Plaform Anti-malware
 2012-09-17 12:45:33 -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
Michael Jurka
999e91559d am b0d22528: am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev 
* commit 'b0d2252897fcc6a0e80b99a3bf856a4a13ab06b8':
  Fix crash in Settings > Security
 2012-09-17 11:29:24 -07:00
Amith Yamasani
418f4dda9c am d477204d: am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 
* commit 'd477204da56b16c4aeee1c26cab8669dcc502756':
  Watch for profile changes and push to user manager
 2012-09-17 11:10:01 -07:00
Jeff Sharkey
91b791bdaf am 93588f63: am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev 
* commit '93588f6323b83a4313456b1918af25a6bc5f8f2f':
  Treat cache storage usage as available space.
 2012-09-17 11:09:59 -07:00
Michael Jurka
bf0bf1d841 am a733a653: am 8227e303: Add support for setting lock widgets 
* commit 'a733a653f6ed213ea75bf789290f578b0ff9452b':
  Add support for setting lock widgets
 2012-09-17 11:09:57 -07:00
Michael Jurka
07d031b250 am 69402162: am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 
* commit '6940216295567926bd04bf23bc5a9740ac054356':
  Adding ability to filter for certain types of widgets in picker activity
 2012-09-17 11:09:23 -07:00
Robert Greenwalt
506d3166bc am 1495043c: am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 
* commit '1495043cdebf279a22cf3f87dcbf4e482804e998':
  Protect self from async change of BluetoothPan
 2012-09-17 10:28:29 -07:00
Baligh Uddin
27a6c5a192 am d0d925d9: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit 'd0d925d96bf0c532cec203fdd2cb35464d247ad5':
  Revert "Import translations. DO NOT MERGE"
 2012-09-17 10:23:41 -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
612cafa056 am 0cbc30f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0cbc30f0b7da22454d1fdc57851f316adbf6aa09':
  Import translations. DO NOT MERGE
 2012-09-17 10:03:03 -07:00
Baligh Uddin
0cbc30f0b7 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-17 10:00:39 -07:00
Robert Greenwalt
5c2c39c3e1 am bdb9fc86: Merge "Must initialize the new atomic.." into jb-mr1-dev 
* commit 'bdb9fc8687fe6fbe7ed9d1222dba21794206c415':
  Must initialize the new atomic..
 2012-09-17 08:15:06 -07:00
Robert Greenwalt
bdb9fc8687 Merge "Must initialize the new atomic.." into jb-mr1-dev 2012-09-17 08:14:07 -07:00
The Android Automerger
e8bffd1285 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-17 06:59:34 -07:00
Amith Yamasani
1921b442ab am 582ab169: Merge "More user management ui work" into jb-mr1-dev 
* commit '582ab1696f1f11b754b0de72b1c8817fea6dae2a':
  More user management ui work
 2012-09-16 23:28:39 -07:00
Amith Yamasani
582ab1696f Merge "More user management ui work" into jb-mr1-dev 2012-09-16 23:26:48 -07:00