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
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
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
b53618d906
am 3db54cb9: Add app details menu item to uninstall an app for all users.
...
* commit '3db54cb97630fe83342c2ca189d13ff5a1a598d3':
Add app details menu item to uninstall an app for all users.
2012-09-16 18:33:44 -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
3135f66e87
am d41fd604: Merge "Ability to hide verification settings" into jb-mr1-dev
...
* commit 'd41fd604cbf557d961f48a05fa40a9afc7b7cac6':
Ability to hide verification settings
2012-09-16 15:52:15 -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
7e2a1c2e89
am 70c6e0fb: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev
...
* commit '70c6e0fb33efd3ccedc5bac654296e6d556b5fd0':
Add support for per-package policy for sending premium SMS.
2012-09-16 14:33:14 -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
Svetoslav Ganov
1fb5be1565
am 260d930e: Merge "Updating the screen magnification description." into jb-mr1-dev
...
* commit '260d930e304b768c31694521375876f11b8367f3':
Updating the screen magnification description.
2012-09-16 14:22:17 -07:00
Svetoslav Ganov
260d930e30
Merge "Updating the screen magnification description." into jb-mr1-dev
2012-09-16 14:20:36 -07:00
Kenny Root
835e0cb708
am cf008c28: Do not allow non-primary user to install certs
...
* commit 'cf008c28b871d4167e5aa19191ca691fb988f8fd':
Do not allow non-primary user to install certs
2012-09-16 14:08:29 -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
a8dbb9b8e4
am 38305fb1: Data usage multi-user support.
...
* commit '38305fb1777147cbcb86774c466e88434daff141':
Data usage multi-user support.
2012-09-15 16:10:56 -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
Svetoslav Ganov
5081855beb
Updating the screen magnification description.
...
bug:7054266
Change-Id: I59466d1e5c70a884badcfd0fdb01ffa3b920b7b7
2012-09-14 19:41:08 -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
rich cannings
70b37e77c7
am b2f4efb7: Correct strings for Plaform Anti-malware
...
* commit 'b2f4efb7a8bacabecaa886cb6b561019630871d9':
Correct strings for Plaform Anti-malware
2012-09-14 16:06:14 -07:00
rich cannings
b2f4efb7a8
Correct strings for Plaform Anti-malware
...
Set strings to:
Verify apps
Disallow or warn before installation of apps that may cause harm
Bug: 7168682
Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365
2012-09-14 14:35:18 -07:00
Michael Jurka
b0d2252897
am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev
...
* commit 'bc7f678cc9334ef9d45a220fd0ef2db9c31019dc':
Fix crash in Settings > Security
2012-09-14 14:13:55 -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
Baligh Uddin
4a44ed7bd7
Import translations. DO NOT MERGE
...
Change-Id: I07c9987422c8e957459b8425f49d1e1fbd25190c
Auto-generated-cl: translation import
2012-09-14 13:50:27 -07:00
Amith Yamasani
d477204da5
am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev
...
* commit '767597b28aebf46e42f7ce194acc09454d8d2324':
Watch for profile changes and push to user manager
2012-09-14 13:08:30 -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
93588f6323
am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev
...
* commit '3a932f33223e54d619014afa3e34799bc6256b69':
Treat cache storage usage as available space.
2012-09-14 13:04:58 -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
a733a653f6
am 8227e303: Add support for setting lock widgets
...
* commit '8227e303850d7c1162c62947b70d0592432b455e':
Add support for setting lock widgets
2012-09-14 12:47:00 -07:00
Michael Jurka
8227e30385
Add support for setting lock widgets
...
Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
2012-09-14 12:44:20 -07:00
Michael Jurka
6940216295
am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev
...
* commit 'a92861471d41a6cfae0c7e6825d02398fdbd0b42':
Adding ability to filter for certain types of widgets in picker activity
2012-09-14 12:21:43 -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
1495043cde
am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev
...
* commit '9310f85dc7f5421f9ca6b1d644c8ddff792e8f37':
Protect self from async change of BluetoothPan
2012-09-14 10:55:47 -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
1891411896
am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev
...
* commit 'b6d7c9c6f93e3d50a3fc5ce2db900a10cbb258e4':
Multi-user battery settings.
2012-09-13 10:37:39 -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