Amith Yamasani
4424d15949
am a7a93784
: Always include default system IMEs for restricted profiles
...
* commit 'a7a93784d1f9798d37cb618def1a558f8d626f0f':
Always include default system IMEs for restricted profiles
2013-04-26 10:47:18 -07:00
Amith Yamasani
a7a93784d1
Always include default system IMEs for restricted profiles
...
Add default IMEs to an exclusion set so that we don't include them in the
list of toggleable system apps that we show the user.
Bug: 8724246
Unrevert the change to include disabled apps, as the above change fixes the
reason for the revert.
Bug: 8713202
Change-Id: Ifced841ad3bfbde33d2403356216dd1749b7fa9a
2013-04-25 23:02:50 -07:00
Amith Yamasani
bae7b2b73f
am c3e973c5
: am 0cb93523
: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
...
* commit 'c3e973c5da358489f6b7042d5be982e4e7ea6d00':
Revert "Disabled apps should also be shown in restricted profiles app list"
2013-04-25 17:14:40 -07:00
Daniel Sandler
a950712b87
am 1344ec19
: am 77f71cb2
: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
...
* commit '1344ec191894e88c998ff091c2afc16e870c46bc':
Follow API changes to NotificationListener.
2013-04-25 17:14:40 -07:00
Svetoslav
424119ae4e
am 259668d8
: am 410e2df4
: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
...
* commit '259668d82ffb66c35a97ea5fff8acf39d948019d':
CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
2013-04-25 17:14:39 -07:00
Amith Yamasani
c3e973c5da
am 0cb93523
: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
...
* commit '0cb93523b261c8779119ffa1cd7a45cf2d6b3814':
Revert "Disabled apps should also be shown in restricted profiles app list"
2013-04-25 16:58:03 -07:00
Daniel Sandler
1344ec1918
am 77f71cb2
: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
...
* commit '77f71cb226203bf3f87eec749296feb3ecd18f43':
Follow API changes to NotificationListener.
2013-04-25 16:58:02 -07:00
Svetoslav
259668d82f
am 410e2df4
: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
...
* commit '410e2df458328d5375b35ef9a610da240293d06b':
CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
2013-04-25 16:58:01 -07:00
Amith Yamasani
0cb93523b2
Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
2013-04-25 22:22:25 +00:00
Amith Yamasani
39d0fd84ad
Revert "Disabled apps should also be shown in restricted profiles app list"
...
This is breaking restricted profiles because the Google Keyboard suddenly
shows up in the list as disabled and InputMethodManagerService crashes
if the only available keyboard is not installed for the profile.
This reverts commit 90dcd7469b
Change-Id: Idd7c4f0f93a973b777889865e80c53caad759a63
2013-04-25 21:39:23 +00:00
Daniel Sandler
77f71cb226
Merge "Follow API changes to NotificationListener." into jb-mr2-dev
2013-04-25 21:04:02 +00:00
Daniel Sandler
fbfddb0d67
Follow API changes to NotificationListener.
...
Requires change If3062b9f in f/b
Bug: 8656860
Change-Id: Ib3dc57489b7308f0515a2a19c5c6451607ff1796
2013-04-25 17:01:37 -04:00
Baligh Uddin
dbb504294b
am 740afcb6
: am f6d483e6
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '740afcb64bb967bb4eada7f7bb071706378d818a':
Import translations. DO NOT MERGE
2013-04-25 13:50:33 -07:00
Amith Yamasani
1cfe2a201e
am 19576444
: am 90dcd746
: Disabled apps should also be shown in restricted profiles app list
...
* commit '1957644448f5874fa82f8313674baa1c49d9ca94':
Disabled apps should also be shown in restricted profiles app list
2013-04-25 13:50:30 -07:00
Svetoslav
410e2df458
Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
2013-04-25 20:32:46 +00:00
Baligh Uddin
740afcb64b
am f6d483e6
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f6d483e6c9c8ee7999d1380b18bf9f30539af228':
Import translations. DO NOT MERGE
2013-04-25 12:17:41 -07:00
Baligh Uddin
f6d483e6c9
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-25 19:15:31 +00:00
Baligh Uddin
86ef1a5d76
Import translations. DO NOT MERGE
...
Change-Id: Iad94d22f497a67893855012a0732678f25f8e50d
Auto-generated-cl: translation import
2013-04-25 12:05:11 -07:00
Amith Yamasani
1957644448
am 90dcd746
: Disabled apps should also be shown in restricted profiles app list
...
* commit '90dcd7469b7e776f508a0767b9db46005af0e8da':
Disabled apps should also be shown in restricted profiles app list
2013-04-25 11:43:44 -07:00
Amith Yamasani
90dcd7469b
Disabled apps should also be shown in restricted profiles app list
...
If we don't show disabled system apps for toggling, they'll end up
being automatically included in the restricted profile.
Make sure that we also list disabled apps.
Bug: 8713202
Change-Id: I8f2facf496f669dfe963cdabf3d29d393097a80b
2013-04-25 11:03:33 -07:00
Svetoslav
8397ba603c
CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
...
CircleFramedDrawable was trying to draw itself as big as the hosting view by
looking at the canvas size. However, due to inconsistent API behavior for the
cases with and without hardware acceleration the canvas size returns the
size of clipped canvas or the size of the entire canvas, respectively. While
we should fix the inconsistent API behavior, it is not correct for a lower
level component to know about the higher level one, i.e. a drawable trying
to infer the size of the hosting view. The hosting view should set the size
of the drawable. This change removes the dependency on the host view size and
if one wants to enlarge the drawable, he/she should just set the scale.
bug:8671059
Change-Id: Idc572da7dff60fd10cb37d3c3eca27aac2c0a21f
2013-04-25 10:41:15 -07:00
The Android Automerger
ac8257b814
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-25 05:55:40 -07:00
Svetoslav
a39f126ba7
am d8e88735
: am d346a1ca
: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
...
* commit 'd8e88735c1c801c3ca54bb5caec2a0291bfd9559':
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
2013-04-24 18:51:41 -07:00
Svetoslav
d8e88735c1
am d346a1ca
: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
...
* commit 'd346a1ca2d78df4532bf103e150610a5dbc948ce':
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
2013-04-24 18:49:23 -07:00
Svetoslav
d346a1ca2d
Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
2013-04-25 01:44:50 +00:00
Svetoslav
5467207b47
The touch exploration capability is dynamically granted pre-JellyBeanMR2.
...
Since the enable touch exploration capability is dynamically granted by
the user for apps targeting pre-JellybeanMR2 API level, we have to avoid
caching copies of the service info.
Framework change:https://googleplex-android-review.googlesource.com/#/c/301722
bug:8633951
Change-Id: I2b409ca92931d1409e885d6f54e0f10cbece2e80
2013-04-24 15:06:21 -07:00
Amith Yamasani
ddb950f5ec
am 7200ae73
: am 868acab2
: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
...
* commit '7200ae73c784b6c180f44dc4a5da033ae4c3ca2d':
Rename limited users to restricted profiles
2013-04-24 15:01:02 -07:00
Amith Yamasani
7200ae73c7
am 868acab2
: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
...
* commit '868acab2a0e82330f6b278f4f93284ca1b6e6225':
Rename limited users to restricted profiles
2013-04-24 14:58:39 -07:00
Amith Yamasani
868acab2a0
Merge "Rename limited users to restricted profiles" into jb-mr2-dev
2013-04-24 21:54:16 +00:00
Amith Yamasani
8e6f99e22b
Rename limited users to restricted profiles
...
Bug: 8705996
Change-Id: Ibf6a2e0e14ce095758fb9be982710b584b76f15d
2013-04-24 14:21:06 -07:00
Maggie Benthall
ea1690ea5e
am 90dad640
: am 8bce7c37
: Merge "UI compliance for WifiSettings" into jb-mr2-dev
...
* commit '90dad6404c2810f9f4110ecec94000c84d7e456d':
UI compliance for WifiSettings
2013-04-24 13:03:19 -07:00
Baligh Uddin
af6202f270
am cfa2954f
: (-s ours) am 243ecbe4
: Import translations. DO NOT MERGE
...
* commit 'cfa2954f1c3e0cf9dfcddea1e87e7637b1c4d585':
Import translations. DO NOT MERGE
2013-04-24 13:03:19 -07:00
Maggie Benthall
90dad6404c
am 8bce7c37
: Merge "UI compliance for WifiSettings" into jb-mr2-dev
...
* commit '8bce7c37d007a2e888c4742cf7ceee749ec573fa':
UI compliance for WifiSettings
2013-04-24 13:00:25 -07:00
Maggie Benthall
8bce7c37d0
Merge "UI compliance for WifiSettings" into jb-mr2-dev
2013-04-24 19:58:24 +00:00
Baligh Uddin
cfa2954f1c
am 243ecbe4
: Import translations. DO NOT MERGE
...
* commit '243ecbe4f4acf8af7c7bf588a869a070f239b274':
Import translations. DO NOT MERGE
2013-04-24 12:28:30 -07:00
Maggie Benthall
91c016de41
UI compliance for WifiSettings
...
Rename and reword string that appears in WifiSettings when user is
restricted from modifying the networks.
Bug: 8696370
Change-Id: I1945550c05163ebff9602e4ba8ba890fece61265
2013-04-24 19:21:10 +00:00
Baligh Uddin
320b39352e
Import translations. DO NOT MERGE
...
Change-Id: I66918f809464bcc9baf0c171ab9baf972a528f99
Auto-generated-cl: translation import
2013-04-24 10:28:56 -07:00
Baligh Uddin
243ecbe4f4
Import translations. DO NOT MERGE
...
Change-Id: Iddaad41f96f86f10ac141f29c97beb396c949715
Auto-generated-cl: translation import
2013-04-24 10:25:21 -07:00
The Android Automerger
901310445b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-24 05:55:48 -07:00
Amith Yamasani
69ce9d7367
am ed0cf41d
: am 99bde108
: Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
...
* commit 'ed0cf41d3a36769b0f7b539e0456aff9d1795339':
Final refactoring of the user/profile settings screen.
2013-04-23 18:53:26 -07:00
Amith Yamasani
ed0cf41d3a
am 99bde108
: Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
...
* commit '99bde10810b4a261045e10b0190b1a8f9d7764ac':
Final refactoring of the user/profile settings screen.
2013-04-23 18:51:16 -07:00
Amith Yamasani
99bde10810
Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
2013-04-24 01:49:07 +00:00
Amith Yamasani
fc8a383d42
Final refactoring of the user/profile settings screen.
...
Name restricted users as restricted profiles and group them all
together.
Bug: 8697415
Change-Id: I18acc6b61bfb12a8e1540eb022a73b29783789e1
2013-04-23 18:45:35 -07:00
Jake Hamby
ddfa75020e
am 92359444
: am 5e9bd86b
: Add support to display regulatory info from *#07#.
...
* commit '923594446499a63c62d2d93495ed5a0cdf83afbb':
Add support to display regulatory info from *#07#.
2013-04-23 15:27:16 -07:00
Jake Hamby
9235944464
am 5e9bd86b
: Add support to display regulatory info from *#07#.
...
* commit '5e9bd86bc6f89b1a743b04d69e793638ffb8cb41':
Add support to display regulatory info from *#07#.
2013-04-23 15:25:24 -07:00
Amith Yamasani
2c670af72a
am f76972ec
: am 2774bc44
: Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
...
* commit 'f76972ec1f916805ff32ae09f56ab0e73b2b6df7':
Fix repeating apps on pause/resume
2013-04-23 15:01:34 -07:00
Jake Hamby
5e9bd86bc6
Add support to display regulatory info from *#07#.
...
Add a new action and Activity so the phone dialer can display
regulatory info via "*#07#".
Regulatory info is supplied per device by a Settings app resource
overlay. This overlay must set the boolean resource
"config_show_regulatory_info" to true, and provide either a drawable
named "regulatory_info.png" with the info in graphical form, or a
string resource named "regulatory_info_text" containing the required
information in HTML format.
Bug: 8259869
Change-Id: I73c1431a1a6d1736f9d3e4bd5be7e3771c85cbcb
2013-04-23 13:06:54 -07:00
Kenny Root
d119ce9daa
am 934ad54f
: am 73e396f8
: Merge "Fix Clear Credentials item" into jb-mr2-dev
...
* commit '934ad54f338a71baddac98c4bfeb67b070453984':
Fix Clear Credentials item
2013-04-23 11:23:42 -07:00
Baligh Uddin
266311bcc3
am f224d219
: (-s ours) am 9c4bba56
: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'f224d219bcef0d3f52627e00c7dd6aed43c480fc':
Import translations. DO NOT MERGE
2013-04-23 11:23:42 -07:00
Svetoslav
377d933181
am 5185b8bc
: am bf3391f1
: Adding UI for editing the name and the picture of a limited user.
...
* commit '5185b8bc271d17c4ffa9dc50cc9a204f5a74937f':
Adding UI for editing the name and the picture of a limited user.
2013-04-23 11:16:49 -07:00