Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,071 Commits 1 Branch 0 Tags
9ee46b1bf00de70bf397f8b686a2ac9a554cc3f5
Commit Graph

3684 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Robert Greenwalt
bdb9fc8687 Merge "Must initialize the new atomic.." into jb-mr1-dev 2012-09-17 08:14:07 -07:00
Amith Yamasani
582ab1696f Merge "More user management ui work" into jb-mr1-dev 2012-09-16 23:26:48 -07:00
Amith Yamasani
ae47ef43fa More user management ui work 
Show setup dialog after adding user.
Write user profile to nickname on setup.
Remove self.
Correct dialog text for user creation.

Bug: 7104261
Bug: 7174751
Bug: 7174685

Change-Id: I0ecd688f3edaef61332f974012454ceb87762e9f
 2012-09-16 23:15:42 -07:00
Dianne Hackborn
3db54cb976 Add app details menu item to uninstall an app for all users. 
Also some fixes: uninstalled apps are now marked as such in the
all apps lists, and sorted to the bottom like disabled apps.  We
don't immediately close the installed app details screen when
launching the uninstall UI.

Change-Id: Id22b749c20fc2441733c604d1de8889269217c5c
 2012-09-16 18:27:14 -07:00
Robert Greenwalt
4f1970fe3e Must initialize the new atomic.. 
bug:7172859
Change-Id: Ibaf390683fa36771215b463fb6b088f7430c0462
 2012-09-16 17:03:08 -07:00
rich cannings
d41fd604cb Merge "Ability to hide verification settings" into jb-mr1-dev 2012-09-16 15:50:09 -07:00
John Huang
70c6e0fb33 Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 2012-09-16 14:31:18 -07:00
Kenny Root
cf008c28b8 Do not allow non-primary user to install certs 
Change-Id: Iefc2970ae23d8ce7d30717add211c01cde251c8d
 2012-09-16 14:04:56 -07:00
rich cannings
bbc3045a26 Ability to hide verification settings 
Add a setting that controls the visibility of the package verification
setting in the Settings app.

Bug:7022814
Change-Id: I6e503924adc112b4528d94b1e533baae6079e85e
 2012-09-16 13:58:07 -07:00
Jeff Sharkey
38305fb177 Data usage multi-user support. 
Switch to storing policy per-user instead of per-app, meaning each
user has control over their own set of apps.  Summarize the usage of
non-current users.  Only allow owner to make changes to overall
network policy.

Hide auto-sync menu when viewing app details.  Search for
MANAGE_NETWORK_USAGE intent across all package names sharing a UID.

Bug: 7121279, 5419594, 6978663
Change-Id: Ia70f04df70d27da27faccb947cd27021c628a41a
 2012-09-14 22:43:51 -07:00
Jake Hamby
3465b67740 Add support for per-package policy for sending premium SMS. 
The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.

Bug: 5513975
Change-Id: I93053fef1524ee7772cc87364c760cb3dbf01ad7
 2012-09-14 16:47:04 -07:00
Michael Jurka
bc7f678cc9 Merge "Fix crash in Settings > Security" into jb-mr1-dev 2012-09-14 14:12:14 -07:00
Michael Jurka
ce72ec7921 Fix crash in Settings > Security 
Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
 2012-09-14 14:09:16 -07:00
Amith Yamasani
767597b28a Merge "Watch for profile changes and push to user manager" into jb-mr1-dev 2012-09-14 13:07:11 -07:00
Jeff Sharkey
3a932f3322 Merge "Treat cache storage usage as available space." into jb-mr1-dev 2012-09-14 13:03:27 -07:00
Jeff Sharkey
ec6e662688 Treat cache storage usage as available space. 
Bug: 7123160
Change-Id: I1b3f36622be557d7c47f1452832f67da40893a02
 2012-09-14 13:01:52 -07:00
Michael Jurka
8227e30385 Add support for setting lock widgets 
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
 2012-09-14 12:44:20 -07:00
Michael Jurka
a92861471d Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev 2012-09-14 12:19:40 -07:00
Robert Greenwalt
9310f85dc7 Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev 2012-09-14 10:53:55 -07:00
Robert Greenwalt
f60b92bb41 Protect self from async change of BluetoothPan 
bug:6945678
Change-Id: I627a55aea9170f889823a38c8e2bb08a06faa841
 2012-09-14 10:40:20 -07:00
Amith Yamasani
32dccbc23f Watch for profile changes and push to user manager 
If the contacts Me Profile changes, push a copy of the photo to
user manager for user by the user switcher.

Also use an async task to load the profile data.

Change-Id: Ie784114622038ff14e3feb70f2ff51c372eecb3f
 2012-09-13 23:32:35 -07:00
Dianne Hackborn
da71d70922 am 18914118: am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev 
* commit '18914118963b59705052049505b1862c367d3cf7':
  Multi-user battery settings.
 2012-09-13 14:12:11 -07:00
Jeff Sharkey
1a5b1f1e88 am 7786df05: am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 
* commit '7786df0508f1de403155a1518d99b509d59e763c':
  Iteration on multi-user Storage UI.
 2012-09-13 14:11:13 -07:00
Dianne Hackborn
b6d7c9c6f9 Merge "Multi-user battery settings." into jb-mr1-dev 2012-09-13 10:36:14 -07:00
Christopher Tate
6fa0dbb178 am cf50b245: am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev 
* commit 'cf50b2452191b043e86b513fa109e756c2c7e332':
  Don't crash during setup of secondary users
 2012-09-13 03:21:39 -07:00
Amith Yamasani
577ee8c0e7 am d9c5310b: am 43db5267: Tell contacts to return back to Settings when done editing the profile info 
* commit 'd9c5310bfccdd964fc4e34ca8b4204c0008db1ba':
  Tell contacts to return back to Settings when done editing the profile info
 2012-09-13 03:21:37 -07:00
Jeff Sharkey
4a0953818d Merge "Iteration on multi-user Storage UI." into jb-mr1-dev 2012-09-13 01:31:46 -07:00
Jeff Sharkey
da13ec0cb4 Iteration on multi-user Storage UI. 
Now that DefaultContainerService has visibility of external storage
for all users, we can measure internal storage in a single pass.
Internal storage measurement now iterates across all known users,
counting both apps and emulated storage usage.

Create MeasurementDetails object with documentation about what is
counted under various device configurations.  Generalize to measure
each Environment.DIRECTORY separately, so it can be combined as
needed.  General cleanup of how measurements are passed to UI.

Bug: 7003520
Change-Id: Ib89c185296a0c9debdc20beeaa98584d803a84e8
 2012-09-13 01:13:48 -07:00
Dianne Hackborn
52e56a2490 Multi-user battery settings. 
Aggregates battery use from other users into one line item.

Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
 2012-09-12 21:45:18 -07:00
Christopher Tate
17a1a0e216 am 5f55c55b: am 4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev 
* commit '5f55c55b3f419b2e848b44b372b5649d5873f2ff':
  Correct settings namespace for auto time/tz
 2012-09-12 17:03:24 -07:00
Christopher Tate
2001a179cc Merge "Don't crash during setup of secondary users" into jb-mr1-dev 2012-09-12 15:54:29 -07:00
Amith Yamasani
43db5267d6 Tell contacts to return back to Settings when done editing the profile info 
Change-Id: I643884af6c062788123b59a115ce6e398430e6b1
 2012-09-12 15:53:54 -07:00