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
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