Commit Graph

4493 Commits

Author SHA1 Message Date
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
Kenny Root
cc48b0104e 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.

Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
2013-04-08 10:23:38 -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
Amith Yamasani
cb7b0b77ae Better app filtering for limited users
Show all system apps that have launchers and widgets.
Show all downloaded apps.
Remove dupes by package name.

Change-Id: Ief59b057e55a55e48ef48c5a638f6daf6a952e4e
2013-03-31 22:40:26 -07:00
Amith Yamasani
5a02cbe2ec am b19daff9: am 2601cd91: Implement proper settings restrictions
* commit 'b19daff9cb6f04a71343f858a0c44415412b8049':
  Implement proper settings restrictions
2013-03-31 18:25:07 -07:00
Amith Yamasani
2601cd9142 Implement proper settings restrictions
Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.

Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
2013-03-31 18:20:36 -07:00
Amith Yamasani
249616ebdb am fe44098d: am 732c80ff: Remove Limited users category if empty
* commit 'fe44098dd126af1a19fe3e29e35506a07bc05c62':
  Remove Limited users category if empty
2013-03-29 20:33:07 -07:00
Amith Yamasani
732c80ff18 Remove Limited users category if empty
If there are no users under limited category, in a secondary user,
remove the subheading completely.

Change-Id: I0397b6198c8cfc147e9e7dc30a92a7cb2f5860e3
2013-03-29 20:28:28 -07:00
Amith Yamasani
377002fa1a am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev
* commit '26aca80eb1813cfe69450383efd8442805b16da5':
  Follow changes to RestrictionEntry API
2013-03-29 18:56:30 -07:00
Amith Yamasani
a7ff2a2d22 Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:48:38 +00:00
Amith Yamasani
6e4757f0a6 Follow changes to RestrictionEntry API
Implement custom restrictions activity.
Fixed some bugs.

Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
2013-03-29 18:40:45 -07:00
Maggie Benthall
6ad2e323f7 When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
Under Settings > Storage, remove the "USB computer connection" menu item.
In case someone launches the UsbSettings screen instead, also disable those checkboxes.

Change-Id: I59ec8b16bed4670beeac8d359e5368e4a659061b
2013-03-29 18:59:33 -04:00
Kenny Root
265398ecb3 am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
* commit 'ab6a6645b01312816fe0688c76b5a26948252850':
  Add KeyStore storage type to Settings UI
2013-03-29 14:36:30 -07:00