Benjamin Poiesz
f18d2fea2a
am 2bd65910
: am b0746763
: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
...
* commit '2bd6591025aaf1d1b5a9a9d0d2ce5981617476b3':
Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
2013-04-11 15:18:02 -07:00
Benjamin Poiesz
b0746763ba
Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
2013-04-11 22:12:10 +00:00
Amith Yamasani
9d2d752654
am c077cd8d
: am d8b0d0ed
: Make sure Settings app restrictions show up
...
* commit 'c077cd8dec7fab6b4224c123007789c1869164ed':
Make sure Settings app restrictions show up
2013-04-11 14:58:21 -07:00
Benjamin Poiesz
cbde502ebb
Forcing the settings apk to be built with the zz_ZZ pseudolocale.
...
This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
Bug #8556677
Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49
2013-04-11 13:32:39 -07:00
Amith Yamasani
d8b0d0ed8e
Make sure Settings app restrictions show up
...
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.
Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
2013-04-11 11:12:35 -07:00
Maggie Benthall
c20bc9f1cd
am 2def3df6
: am 3c3fa0cc
: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
...
* commit '2def3df600d13000855ce352536b49094d746be4':
Implement Settings app UX for when a user has bluetooth config locked down.
2013-04-11 07:12:06 -07:00
Maggie Benthall
3c3fa0ccb8
Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
2013-04-11 14:04:40 +00:00
Amith Yamasani
8ce6386484
am 7805d74c
: am d81a3f73
: Improve app list for limited users
...
* commit '7805d74cd7710c868bdebae872c79470b622c86f':
Improve app list for limited users
2013-04-10 22:16:15 -07:00
Amith Yamasani
d81a3f7368
Improve app list for limited users
...
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.
Bug: 8520813 lowercase app names
Bug: 8520185 apps installed only in limited user
Bug: 8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
2013-04-10 21:59:18 -07:00
Svetoslav
549857a8b4
am fce2148f
: am 96cd9e7c
: First accessibility device disabled if enableing a second one is canceled.
...
* commit 'fce2148f3c679ef12ee59a8dcf071e34cea100f5':
First accessibility device disabled if enableing a second one is canceled.
2013-04-10 18:22:49 -07:00
Svetoslav
96cd9e7cc7
First accessibility device disabled if enableing a second one is canceled.
...
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.
bug:7716830
Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
2013-04-10 17:33:42 -07:00
Dianne Hackborn
ab27d31a81
am 5d46a54c
: am 8c94273c
: Merge "Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
...
* commit '5d46a54c55a4e48332905bd927c24bc2544e2893':
Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats
2013-04-10 14:18:56 -07:00
Dianne Hackborn
1d675e6546
Fix issue #7691456 : adbd CPU usage identified as Bluetooth in battery stats
...
Should be comparing with Bluetooth UID, not the wrong and broken GID.
Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
2013-04-10 12:50:32 -07:00
Amith Yamasani
e2367654b6
am 0c8f9246
: am 80b1dfe4
: Merge "Select text in user name dialog" into jb-mr2-dev
...
* commit '0c8f9246437234a0de217feb339c5811012bea5c':
Select text in user name dialog
2013-04-09 17:33:13 -07:00
Amith Yamasani
80b1dfe46a
Merge "Select text in user name dialog" into jb-mr2-dev
2013-04-10 00:29:12 +00:00
Amith Yamasani
583757908b
Select text in user name dialog
...
Enables quickly changing the name without moving the cursor.
Also use cap words style.
Bug: 8518507
Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
2013-04-09 17:26:43 -07:00
Wink Saville
69e57fa7f3
am 9f5f4fdd
: am 460f2478
: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
...
* commit '9f5f4fdde61fabb634885e71f845d8d3c1fc9c7b':
Add FW support for CellInfo RIL commands.
2013-04-09 16:02:04 -07:00
Wink Saville
460f24786a
Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
2013-04-09 22:50:41 +00:00
Ben Murdoch
9f8c61ee1a
am 6fdc642e
: am f452008f
: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
...
* commit '6fdc642e8640927bee97f93812a58897afa252e9':
Properly remove experimental WebView preference when unavailable.
2013-04-09 14:25:22 -07:00
Amith Yamasani
dfead4eb31
am e9691ed5
: am 0a970cae
: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
...
* commit 'e9691ed5fb51b58dc4b144fec4226e6353f8df93':
Send app restrictions broadcast to stopped apps as well
2013-04-09 14:25:16 -07:00
Ben Murdoch
f452008f5b
Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
2013-04-09 19:00:41 +00:00
Jared Duke
9225bc538d
Properly remove experimental WebView preference when unavailable.
...
When the experimental WebView library is unavailable, properly remove it from
the appropriate preferences group.
Bug: 8572673
Change-Id: I34dd0720199c826ca12e0f991e2f6bd9c5ad35f3
2013-04-09 19:14:57 +01:00
Amith Yamasani
0a970caed4
Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
2013-04-09 18:09:40 +00:00
Amith Yamasani
872d4fba77
Send app restrictions broadcast to stopped apps as well
...
Otherwise the restrictions won't be shown for apps that haven't been
launched yet.
Bug: 8577600
Change-Id: I1d0d93553456dfedfb749e3d8262911af4362a80
2013-04-09 11:05:18 -07:00
Amith Yamasani
66ab414ea8
am 631285a4
: am 350938ec
: Potential fix for a monkey-related NPE
...
* commit '631285a43f0c1de9df02d3ebd1c4e22a6ef74d1f':
Potential fix for a monkey-related NPE
2013-04-09 10:39:32 -07:00
Amith Yamasani
350938ecc6
Potential fix for a monkey-related NPE
...
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.
Bug: 8005271
Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
2013-04-09 10:25:43 -07:00
Wink Saville
bf4712895a
Add FW support for CellInfo RIL commands.
...
Add being able to setCellInfoListRate.
Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
2013-04-08 15:19:44 -07:00
Maggie Benthall
11b69bf86d
Implement Settings app UX for when a user has bluetooth config locked down.
...
When a user has the user restriction DISALLOW_CONFIG_BLUETOOTH
- Remove all the menu items for searching and other config
- Hide "available" but non-paired devices
- Remove settings button from paired devices
- Remove ability to make the device visible to others
Change-Id: Icaebf29d3cce55d924fdd65449447b5b7a438bbe
2013-04-08 16:05:38 -04:00
Kenny Root
fc783b06cd
am 56e75f3c
: am 645e78d8
: Merge "Allow multiuser use of keystore" into jb-mr2-dev
...
* commit '56e75f3c170f859ecd05b43ca5e3a14ac7878cf7':
Allow multiuser use of keystore
2013-04-08 11:07:37 -07:00
Kenny Root
645e78d806
Merge "Allow multiuser use of keystore" into jb-mr2-dev
2013-04-08 17:58:37 +00:00
Kenny Root
c5550c2012
Allow multiuser use of keystore
...
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.
(cherry picked from commit cc48b0104e
)
Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
2013-04-08 10:36:05 -07:00
Daniel Sandler
2fb4c37260
am afa0b2c5
: am b8c4898c
: Fix "no notification listeners" text.
...
* commit 'afa0b2c5a884107d135c868bb6a0659990051005':
Fix "no notification listeners" text.
2013-04-08 09:15:46 -07:00
Daniel Sandler
b8c4898c64
Fix "no notification listeners" text.
...
Bug: 8454150
Change-Id: I6b02367e2be9f31fdf0a54d7fc0c49f8c82922d7
2013-04-08 12:01:33 -04:00
Nick Kralevich
916676515b
am 4f9dc39a
: am b26a61d6
: InstalledAppDetails: allow revocable permission.
...
* commit '4f9dc39a8a7db18a5156a645fe761c11deb57d99':
InstalledAppDetails: allow revocable permission.
2013-04-07 10:59:01 -07:00
Nick Kralevich
b26a61d643
InstalledAppDetails: allow revocable permission.
...
Modify the Settings app so that a user can revoke permissions,
using the new API added in AppSecurityPermissions.
Bug: 8332307
Change-Id: I4d6c10877e2c3cc284dbf9a43f79697914c0b192
2013-04-05 18:39:15 -07:00
Daniel Sandler
225be3ce37
am 3c3a3b7e
: am 79b9bfe5
: Notification listeners can be enabled in Settings>Security.
...
* commit '3c3a3b7eb0b7d8df49d823aa74de2e868f0e189b':
Notification listeners can be enabled in Settings>Security.
2013-04-05 13:02:25 -07:00
Daniel Sandler
8646ab979f
am 861b2242
: am e44f5e2b
: Reference new StatusBarNotification and INotificationListener packages.
...
* commit '861b224281f60fffb171a7dd297328efbe09fc9b':
Reference new StatusBarNotification and INotificationListener packages.
2013-04-05 13:02:25 -07:00
Daniel Sandler
79b9bfe56e
Notification listeners can be enabled in Settings>Security.
...
Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.
Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
2013-04-05 19:57:03 +00:00
Daniel Sandler
e44f5e2bd6
Reference new StatusBarNotification and INotificationListener packages.
...
Requires change I1be46f82 in f/b.
Bug: 8199624
Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa
2013-04-05 19:55:12 +00:00
Kristian Monsen
704793f374
am 3c6c45f9
: am a95604de
: Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
...
* commit '3c6c45f931307af098e790e86b114c804655f42b':
Adding developer toggle for using Chromium WebView.
2013-04-05 10:51:22 -07:00
Kristian Monsen
a95604de1a
Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
2013-04-05 17:41:34 +00:00
Fabrice Di Meglio
8a34360c25
am 66fe9882
: am e68959de
: Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
...
* commit '66fe98823f7b38387034ed3bfc9a90d629a5a980':
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
2013-04-04 11:06:49 -07:00
Fabrice Di Meglio
e68959de3a
Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev
2013-04-04 17:59:50 +00:00
Fabrice Di Meglio
f2a9717b93
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
...
- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"
Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
2013-04-02 18:36:43 -07:00
Robert Greenwalt
c41346d5bd
am 456eadd9
: am 58f9cbd6
: Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
...
* commit '456eadd9feb4b570ba59c6cbbd43013484d31f62':
pre-provide the mvno data of the edited apn
2013-04-02 12:29:10 -07:00
Robert Greenwalt
58f9cbd677
Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
2013-04-02 19:20:13 +00:00
Sungmin Choi
cd1cb16bad
pre-provide the mvno data of the edited apn
...
For mvno, user can add or edit mvno data field.
Pre-provide the mvno data of the edited apn when the user selects
one of the mvno types.
For example if user choose gid, populate the data field with the
current sim's gid1 data, or if user choose the SPN option, fill
in data with the current carrier string. If IMSI, fill in imsi data.
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
2013-04-01 16:44:15 -07:00
Maggie Benthall
28d53dc9c0
am e427ccdc
: am 8d9b07ed
: Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
...
* commit 'e427ccdce304a8afe8ebb493d60e94de56acedb3':
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
2013-04-01 11:55:05 -07:00
Maggie Benthall
8d9b07edb1
Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev
2013-04-01 18:50:30 +00:00
Amith Yamasani
606b8aa9ed
am 52d9a78f
: am cb7b0b77
: Better app filtering for limited users
...
* commit '52d9a78f2241b62e6fa1ce9e07777d7c8e30af96':
Better app filtering for limited users
2013-03-31 22:46:01 -07:00