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
Robert Greenwalt
2acf50810f
am bdb9fc86
: Merge "Must initialize the new atomic.." into jb-mr1-dev
...
* commit 'bdb9fc8687fe6fbe7ed9d1222dba21794206c415':
Must initialize the new atomic..
2012-09-17 08:15:14 -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
dc7c31a092
am 582ab169
: Merge "More user management ui work" into jb-mr1-dev
...
* commit '582ab1696f1f11b754b0de72b1c8817fea6dae2a':
More user management ui work
2012-09-16 23:28:45 -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
fe1e411578
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:46 -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
505cf79f2a
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
2a1bd635ad
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:18 -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
99e3093967
am 260d930e
: Merge "Updating the screen magnification description." into jb-mr1-dev
...
* commit '260d930e304b768c31694521375876f11b8367f3':
Updating the screen magnification description.
2012-09-16 14:22:30 -07:00
Svetoslav Ganov
260d930e30
Merge "Updating the screen magnification description." into jb-mr1-dev
2012-09-16 14:20:36 -07:00