OSDN Git Service
Amith Yamasani [Fri, 26 Apr 2013 00:14:40 +0000 (17:14 -0700)]
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"
Daniel Sandler [Fri, 26 Apr 2013 00:14:40 +0000 (17:14 -0700)]
am
1344ec19: am
77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
* commit '
1344ec191894e88c998ff091c2afc16e870c46bc':
Follow API changes to NotificationListener.
Svetoslav [Fri, 26 Apr 2013 00:14:39 +0000 (17:14 -0700)]
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.
Amith Yamasani [Thu, 25 Apr 2013 23:58:03 +0000 (16:58 -0700)]
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"
Daniel Sandler [Thu, 25 Apr 2013 23:58:02 +0000 (16:58 -0700)]
am
77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev
* commit '
77f71cb226203bf3f87eec749296feb3ecd18f43':
Follow API changes to NotificationListener.
Svetoslav [Thu, 25 Apr 2013 23:58:01 +0000 (16:58 -0700)]
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.
Amith Yamasani [Thu, 25 Apr 2013 22:22:25 +0000 (22:22 +0000)]
Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev
Amith Yamasani [Thu, 25 Apr 2013 21:39:23 +0000 (21:39 +0000)]
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
90dcd7469b7e776f508a0767b9db46005af0e8da
Change-Id: Idd7c4f0f93a973b777889865e80c53caad759a63
Daniel Sandler [Thu, 25 Apr 2013 21:04:01 +0000 (21:04 +0000)]
Merge "Follow API changes to NotificationListener." into jb-mr2-dev
Daniel Sandler [Thu, 25 Apr 2013 21:01:01 +0000 (17:01 -0400)]
Follow API changes to NotificationListener.
Requires change If3062b9f in f/b
Bug:
8656860
Change-Id: Ib3dc57489b7308f0515a2a19c5c6451607ff1796
Baligh Uddin [Thu, 25 Apr 2013 20:50:33 +0000 (13:50 -0700)]
am
740afcb6: am
f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
740afcb64bb967bb4eada7f7bb071706378d818a':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 25 Apr 2013 20:50:30 +0000 (13:50 -0700)]
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
Svetoslav [Thu, 25 Apr 2013 20:32:46 +0000 (20:32 +0000)]
Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev
Baligh Uddin [Thu, 25 Apr 2013 19:17:41 +0000 (12:17 -0700)]
am
f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
f6d483e6c9c8ee7999d1380b18bf9f30539af228':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Apr 2013 19:15:31 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 25 Apr 2013 19:05:11 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad94d22f497a67893855012a0732678f25f8e50d
Auto-generated-cl: translation import
Amith Yamasani [Thu, 25 Apr 2013 18:43:44 +0000 (11:43 -0700)]
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
Amith Yamasani [Thu, 25 Apr 2013 18:03:33 +0000 (11:03 -0700)]
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
Svetoslav [Thu, 25 Apr 2013 17:33:08 +0000 (10:33 -0700)]
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
Svetoslav [Thu, 25 Apr 2013 01:51:41 +0000 (18:51 -0700)]
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.
Svetoslav [Thu, 25 Apr 2013 01:49:23 +0000 (18:49 -0700)]
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.
Svetoslav [Thu, 25 Apr 2013 01:44:50 +0000 (01:44 +0000)]
Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev
Svetoslav [Wed, 24 Apr 2013 22:03:41 +0000 (15:03 -0700)]
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
Amith Yamasani [Wed, 24 Apr 2013 22:01:02 +0000 (15:01 -0700)]
am
7200ae73: am
868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
* commit '
7200ae73c784b6c180f44dc4a5da033ae4c3ca2d':
Rename limited users to restricted profiles
Amith Yamasani [Wed, 24 Apr 2013 21:58:39 +0000 (14:58 -0700)]
am
868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev
* commit '
868acab2a0e82330f6b278f4f93284ca1b6e6225':
Rename limited users to restricted profiles
Amith Yamasani [Wed, 24 Apr 2013 21:54:15 +0000 (21:54 +0000)]
Merge "Rename limited users to restricted profiles" into jb-mr2-dev
Amith Yamasani [Wed, 24 Apr 2013 21:21:06 +0000 (14:21 -0700)]
Rename limited users to restricted profiles
Bug:
8705996
Change-Id: Ibf6a2e0e14ce095758fb9be982710b584b76f15d
Maggie Benthall [Wed, 24 Apr 2013 20:03:19 +0000 (13:03 -0700)]
am
90dad640: am
8bce7c37: Merge "UI compliance for WifiSettings" into jb-mr2-dev
* commit '
90dad6404c2810f9f4110ecec94000c84d7e456d':
UI compliance for WifiSettings
Baligh Uddin [Wed, 24 Apr 2013 20:03:19 +0000 (13:03 -0700)]
am
cfa2954f: (-s ours) am
243ecbe4: Import translations. DO NOT MERGE
* commit '
cfa2954f1c3e0cf9dfcddea1e87e7637b1c4d585':
Import translations. DO NOT MERGE
Maggie Benthall [Wed, 24 Apr 2013 20:00:25 +0000 (13:00 -0700)]
am
8bce7c37: Merge "UI compliance for WifiSettings" into jb-mr2-dev
* commit '
8bce7c37d007a2e888c4742cf7ceee749ec573fa':
UI compliance for WifiSettings
Maggie Benthall [Wed, 24 Apr 2013 19:58:23 +0000 (19:58 +0000)]
Merge "UI compliance for WifiSettings" into jb-mr2-dev
Baligh Uddin [Wed, 24 Apr 2013 19:28:30 +0000 (12:28 -0700)]
am
243ecbe4: Import translations. DO NOT MERGE
* commit '
243ecbe4f4acf8af7c7bf588a869a070f239b274':
Import translations. DO NOT MERGE
Maggie Benthall [Tue, 23 Apr 2013 19:03:22 +0000 (15:03 -0400)]
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
Baligh Uddin [Wed, 24 Apr 2013 17:28:56 +0000 (10:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: I66918f809464bcc9baf0c171ab9baf972a528f99
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Apr 2013 17:25:21 +0000 (10:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddaad41f96f86f10ac141f29c97beb396c949715
Auto-generated-cl: translation import
Amith Yamasani [Wed, 24 Apr 2013 01:53:26 +0000 (18:53 -0700)]
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.
Amith Yamasani [Wed, 24 Apr 2013 01:51:16 +0000 (18:51 -0700)]
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.
Amith Yamasani [Wed, 24 Apr 2013 01:49:07 +0000 (01:49 +0000)]
Merge "Final refactoring of the user/profile settings screen." into jb-mr2-dev
Amith Yamasani [Tue, 23 Apr 2013 18:44:59 +0000 (11:44 -0700)]
Final refactoring of the user/profile settings screen.
Name restricted users as restricted profiles and group them all
together.
Bug:
8697415
Change-Id: I18acc6b61bfb12a8e1540eb022a73b29783789e1
Jake Hamby [Tue, 23 Apr 2013 22:27:16 +0000 (15:27 -0700)]
am
92359444: am
5e9bd86b: Add support to display regulatory info from *#07#.
* commit '
923594446499a63c62d2d93495ed5a0cdf83afbb':
Add support to display regulatory info from *#07#.
Jake Hamby [Tue, 23 Apr 2013 22:25:24 +0000 (15:25 -0700)]
am
5e9bd86b: Add support to display regulatory info from *#07#.
* commit '
5e9bd86bc6f89b1a743b04d69e793638ffb8cb41':
Add support to display regulatory info from *#07#.
Amith Yamasani [Tue, 23 Apr 2013 22:01:34 +0000 (15:01 -0700)]
am
f76972ec: am
2774bc44: Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
* commit '
f76972ec1f916805ff32ae09f56ab0e73b2b6df7':
Fix repeating apps on pause/resume
Jake Hamby [Tue, 9 Apr 2013 22:48:25 +0000 (15:48 -0700)]
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
Kenny Root [Tue, 23 Apr 2013 18:23:42 +0000 (11:23 -0700)]
am
934ad54f: am
73e396f8: Merge "Fix Clear Credentials item" into jb-mr2-dev
* commit '
934ad54f338a71baddac98c4bfeb67b070453984':
Fix Clear Credentials item
Baligh Uddin [Tue, 23 Apr 2013 18:23:42 +0000 (11:23 -0700)]
am
f224d219: (-s ours) am
9c4bba56: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
f224d219bcef0d3f52627e00c7dd6aed43c480fc':
Import translations. DO NOT MERGE
Svetoslav [Tue, 23 Apr 2013 18:16:49 +0000 (11:16 -0700)]
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.
Amith Yamasani [Tue, 23 Apr 2013 18:16:48 +0000 (11:16 -0700)]
am
e6910a4c: am
fce45015: Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev
* commit '
e6910a4cf2e3675a68efe7fb019ea65d719df009':
Several improvements and fixes in restrictions UI
Amith Yamasani [Tue, 23 Apr 2013 17:15:52 +0000 (10:15 -0700)]
am
2774bc44: Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
* commit '
2774bc4413e103e79768ddace8356c997984513e':
Fix repeating apps on pause/resume
Amith Yamasani [Tue, 23 Apr 2013 17:13:46 +0000 (17:13 +0000)]
Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
Kenny Root [Tue, 23 Apr 2013 10:51:45 +0000 (03:51 -0700)]
am
73e396f8: Merge "Fix Clear Credentials item" into jb-mr2-dev
* commit '
73e396f8ffcb89f466c8767ccd9864ec2b1cd203':
Fix Clear Credentials item
Baligh Uddin [Tue, 23 Apr 2013 10:51:13 +0000 (03:51 -0700)]
am
9c4bba56: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
9c4bba564745dcaa2aaa63c156f6d11afe05202e':
Import translations. DO NOT MERGE
Svetoslav [Tue, 23 Apr 2013 10:50:28 +0000 (03:50 -0700)]
am
bf3391f1: Adding UI for editing the name and the picture of a limited user.
* commit '
bf3391f19b6f1733825de07d9c602545f8818c64':
Adding UI for editing the name and the picture of a limited user.
Amith Yamasani [Tue, 23 Apr 2013 10:50:27 +0000 (03:50 -0700)]
am
fce45015: Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev
* commit '
fce4501512dbf00f6825abc37f91b6aea8b9dc28':
Several improvements and fixes in restrictions UI
Amith Yamasani [Mon, 22 Apr 2013 20:37:58 +0000 (13:37 -0700)]
Fix repeating apps on pause/resume
Preference list was getting duplicated on pausing and resuming the activity.
Pull the user info out of the preference list and make it a static header
so that it stays fixed. Can now remove all entries before re-adding.
Disable location by default and disable ability to change Unknown sources
toggle.
Bug:
8685561
Bug:
8688400
Change-Id: I64ce728d5369e03ddaba562bcd66bb0720a037d2
Kenny Root [Mon, 22 Apr 2013 23:46:02 +0000 (23:46 +0000)]
Merge "Fix Clear Credentials item" into jb-mr2-dev
Baligh Uddin [Mon, 22 Apr 2013 21:45:38 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Kenny Root [Mon, 22 Apr 2013 20:41:18 +0000 (13:41 -0700)]
Fix Clear Credentials item
This should be enabled whenever there is a credential in the keystore
since there can be unencrypted credentials in there now.
Bug:
8651830
Change-Id: I52a8262011d744d782b35d97deaabcba3b23f32b
Svetoslav [Mon, 15 Apr 2013 19:20:39 +0000 (12:20 -0700)]
Adding UI for editing the name and the picture of a limited user.
A limited user may not have access to contacts, thus the settings
app has to be able to show UI for selecting a user photo from
gallery or via camera.
bug:
8566861
Change-Id: I1974b1a19b0fee8c737d1345302e1b2fba108379
Baligh Uddin [Mon, 22 Apr 2013 18:07:27 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13ce0c3329228630c2fee94df2320e0c81cd1ddd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Apr 2013 18:04:06 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08d8d19f84ddbc4ea46f4c750803af0d22199919
Auto-generated-cl: translation import
Amith Yamasani [Fri, 19 Apr 2013 23:48:11 +0000 (23:48 +0000)]
Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev
Amith Yamasani [Fri, 19 Apr 2013 22:27:52 +0000 (15:27 -0700)]
Several improvements and fixes in restrictions UI
Bug:
8668906 : Add string indicating that the app has opted-in
Bug:
8663558 : Fix a crash in settings when EXTRA_RESTRICTIONS_LIST is empty
Also accept EXTRA_RESTRICTIONS_BUNDLE as a result from custom
restrictions activity
Bug:
8653389 : Some apps show up twice in the limited user config screen
Bug:
8653915 : Jank when adding a new limited user
Change-Id: I293148000be70850f565dbddb4c942d69142ae17
Fabrice Di Meglio [Fri, 19 Apr 2013 21:38:45 +0000 (14:38 -0700)]
am
7c9b3acc: am
88083a3e: Merge "Fix bug #
8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
* commit '
7c9b3accfc293581f48fa8475803fe2eb612ccdc':
Fix bug #
8665924 Native arabic numerals in the bluetooth pairing ui
Fabrice Di Meglio [Fri, 19 Apr 2013 21:23:10 +0000 (14:23 -0700)]
am
88083a3e: Merge "Fix bug #
8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
* commit '
88083a3e04efcba725c721b0bcc60faa6b673bee':
Fix bug #
8665924 Native arabic numerals in the bluetooth pairing ui
Fabrice Di Meglio [Fri, 19 Apr 2013 21:20:03 +0000 (21:20 +0000)]
Merge "Fix bug #
8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
Fabrice Di Meglio [Fri, 19 Apr 2013 20:50:59 +0000 (13:50 -0700)]
Fix bug #
8665924 Native arabic numerals in the bluetooth pairing ui
- force LATIN digits for passkey
Change-Id: Ifc7fc746677df4c1e9013ecfe6e9f4887f2d4f1d
Matthew Xie [Fri, 19 Apr 2013 19:49:31 +0000 (12:49 -0700)]
am
1c9e90d3: am
89845158: Merge "Change SettingsAppWidgetProvider export to be false" into jb-mr2-dev
* commit '
1c9e90d3284173455ad0da5e02b1aa7372a9b8fc':
Change SettingsAppWidgetProvider export to be false
Matthew Xie [Fri, 19 Apr 2013 19:46:53 +0000 (12:46 -0700)]
am
89845158: Merge "Change SettingsAppWidgetProvider export to be false" into jb-mr2-dev
* commit '
89845158de132a5aa2df683c3fe1d5a5fc0109e1':
Change SettingsAppWidgetProvider export to be false
Matthew Xie [Fri, 19 Apr 2013 18:42:54 +0000 (18:42 +0000)]
Merge "Change SettingsAppWidgetProvider export to be false" into jb-mr2-dev
Jean Chalard [Fri, 19 Apr 2013 17:36:07 +0000 (10:36 -0700)]
am
89d02a52: am
0ac95054: Add hints to some text fields for RTL
* commit '
89d02a52e0f282bff1c6375b8456b556c1680a30':
Add hints to some text fields for RTL
Jean Chalard [Fri, 19 Apr 2013 17:33:06 +0000 (10:33 -0700)]
am
0ac95054: Add hints to some text fields for RTL
* commit '
0ac950542d86c6803b80d0fd73f0508a687d225b':
Add hints to some text fields for RTL
Jean Chalard [Fri, 19 Apr 2013 12:46:14 +0000 (21:46 +0900)]
Add hints to some text fields for RTL
Having a hint makes sure the cursor is positioned in the right
end of the text field by default for both LTR and RTL locales.
This fixes the user dictionary "add to dictionary" interface
parts, and the "connect to hidden network" interface.
Bug:
8654823
Change-Id: I7c83d35734e53da94bb949e362c5260934ef0b76
Matthew Xie [Fri, 19 Apr 2013 06:43:42 +0000 (23:43 -0700)]
Change SettingsAppWidgetProvider export to be false
This will protect settings from external broadcaster.
bug
7961958
Change-Id: Id6d0bf83ef19f2b5c2641231cba2dc65a1492797
Satoshi Kataoka [Fri, 19 Apr 2013 03:09:32 +0000 (20:09 -0700)]
am
c19a82a3: am
b5b541a5: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
* commit '
c19a82a3798d8de616c72ce3993a330e021e2259':
Fix sort order of InputMethodSubtype
Satoshi Kataoka [Fri, 19 Apr 2013 03:06:21 +0000 (20:06 -0700)]
am
b5b541a5: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
* commit '
b5b541a5776b95a985512b3bf694cac2301d8f06':
Fix sort order of InputMethodSubtype
Satoshi Kataoka [Fri, 19 Apr 2013 03:04:26 +0000 (03:04 +0000)]
Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
Dianne Hackborn [Fri, 19 Apr 2013 01:34:00 +0000 (18:34 -0700)]
am
d356c038: am
d410350b: Merge "Fix issue #
8647812: Hide app ops choice from settings shortcut" into jb-mr2-dev
* commit '
d356c0387ee0fe4c2a5d95f85f6622febd4c7953':
Fix issue #
8647812: Hide app ops choice from settings shortcut
Dianne Hackborn [Fri, 19 Apr 2013 01:29:59 +0000 (18:29 -0700)]
am
d410350b: Merge "Fix issue #
8647812: Hide app ops choice from settings shortcut" into jb-mr2-dev
* commit '
d410350b5e1b55f306e6fe0dba866034df7556e8':
Fix issue #
8647812: Hide app ops choice from settings shortcut
Dianne Hackborn [Fri, 19 Apr 2013 01:27:07 +0000 (01:27 +0000)]
Merge "Fix issue #
8647812: Hide app ops choice from settings shortcut" into jb-mr2-dev
Svetoslav [Fri, 19 Apr 2013 01:05:24 +0000 (18:05 -0700)]
am
78c7c3fa: am
9e7a84e2: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
* commit '
78c7c3faf62114a2197fbfa4dc319405c267b44d':
Replacing accessibility service permissions with capability attributes.
Svetoslav [Fri, 19 Apr 2013 01:01:32 +0000 (18:01 -0700)]
am
9e7a84e2: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
* commit '
9e7a84e2684e94ea5ea2e036b9bb4f214cedab2e':
Replacing accessibility service permissions with capability attributes.
Svetoslav [Fri, 19 Apr 2013 00:56:59 +0000 (00:56 +0000)]
Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
Dianne Hackborn [Thu, 18 Apr 2013 22:07:19 +0000 (15:07 -0700)]
Fix issue #
8647812: Hide app ops choice from settings shortcut
Change-Id: Ifa26a70f4614d3530cc27b360df2b6d5f03b28e3
Satoshi Kataoka [Thu, 18 Apr 2013 16:09:02 +0000 (01:09 +0900)]
Fix sort order of InputMethodSubtype
Bug:
8638372
Change-Id: I65d30f968708dc836635f687aa51b51816daccdb
Amith Yamasani [Thu, 18 Apr 2013 05:17:29 +0000 (22:17 -0700)]
am
ac395aae: am
d4abdd27: Reorganize users screen
* commit '
ac395aaed59a70cb2b2eb36fa3b935cb0d12b20f':
Reorganize users screen
Amith Yamasani [Thu, 18 Apr 2013 05:15:03 +0000 (22:15 -0700)]
am
d4abdd27: Reorganize users screen
* commit '
d4abdd27adac36e7243bcaae37a7a2c69ac73db7':
Reorganize users screen
Amith Yamasani [Thu, 18 Apr 2013 01:27:01 +0000 (18:27 -0700)]
Reorganize users screen
As per product/ux feedback, move around and rename the users.
Settings button for some users.
Fix crash in limited user when clicking on the user:
Bug:
8494377
Change-Id: I346d12646d32608b01f2c2c2c866b6da51408618
Baligh Uddin [Thu, 18 Apr 2013 03:49:20 +0000 (20:49 -0700)]
am
51a860fe: am
4e8cbb32: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
51a860fe9b96685802377c6229bcbcb42b866b59':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 03:45:06 +0000 (20:45 -0700)]
am
4e8cbb32: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
4e8cbb32a2ecef9c0bbdaaeb97e6fc29ec14a902':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Apr 2013 03:42:09 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 18 Apr 2013 03:41:23 +0000 (03:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Svetoslav [Wed, 17 Apr 2013 01:54:53 +0000 (18:54 -0700)]
Replacing accessibility service permissions with capability attributes.
Accessibility services can perform special operations such as retrieve
the screen content, enable explore by touch, etc. To ensure the user
is aware that the service will perform special operations we were using
permissions. However, the special operations cannot be performed unless
the service is really enabled by the user and it is at this point that
we want to notify the user about the service capabilities.
This change adds the list of the service capabilities to the enable
warining dialog such that the user can asses whether to he/she is fine
with this service performing certain special operations.
Main change:https://googleplex-android-review.googlesource.com/#/c/298110/
bug:
8633951
Change-Id: I1617fa82126b9a674cb74a15d7004a7cc007c7d3
Jeff Brown [Thu, 18 Apr 2013 02:29:14 +0000 (19:29 -0700)]
am
8d37841e: am
ebd61e36: Ensure WFD switch is removed along with settings fragment.
* commit '
8d37841e26e6acca91d7c3d147f380d891e31cca':
Ensure WFD switch is removed along with settings fragment.
Jeff Brown [Thu, 18 Apr 2013 02:26:20 +0000 (19:26 -0700)]
am
ebd61e36: Ensure WFD switch is removed along with settings fragment.
* commit '
ebd61e36b2de03e5ccf2ab590cc44c817a3888ff':
Ensure WFD switch is removed along with settings fragment.
Jeff Brown [Thu, 18 Apr 2013 02:22:05 +0000 (19:22 -0700)]
Ensure WFD switch is removed along with settings fragment.
Bug:
8340072
Change-Id: I8d203725ef1bfa5b1b5e5c224fa57d5feaa9db5a
Jim Miller [Wed, 17 Apr 2013 20:43:08 +0000 (13:43 -0700)]
am
71732616: am
cf00931c: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '
717326167bcf95ef64c8bf6f26a5b475fa1fddf9':
Move owner info from Settings.Secure to LockSettings
Jim Miller [Wed, 17 Apr 2013 20:40:55 +0000 (13:40 -0700)]
am
cf00931c: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
* commit '
cf00931c09a39e89806649a69c96a98bd7619368':
Move owner info from Settings.Secure to LockSettings
Jim Miller [Wed, 17 Apr 2013 20:37:29 +0000 (20:37 +0000)]
Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
Amith Yamasani [Wed, 17 Apr 2013 18:34:29 +0000 (11:34 -0700)]
am
05f5437a: am
5ee17505: Changes to deal with restrictions API change
* commit '
05f5437af1d7a6fa5ca27f9cadef0521c05ae09d':
Changes to deal with restrictions API change
Amith Yamasani [Wed, 17 Apr 2013 18:30:42 +0000 (11:30 -0700)]
am
5ee17505: Changes to deal with restrictions API change
* commit '
5ee175051951d3a0bc1533aece69af520c295d37':
Changes to deal with restrictions API change