summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* am 4f9dc39a: am b26a61d6: InstalledAppDetails: allow revocable permission.Nick Kralevich2013-04-071-1/+1
|\ | | | | | | | | * commit '4f9dc39a8a7db18a5156a645fe761c11deb57d99': InstalledAppDetails: allow revocable permission.
| * InstalledAppDetails: allow revocable permission.Nick Kralevich2013-04-051-1/+1
| | | | | | | | | | | | | | | | Modify the Settings app so that a user can revoke permissions, using the new API added in AppSecurityPermissions. Bug: 8332307 Change-Id: I4d6c10877e2c3cc284dbf9a43f79697914c0b192
* | am 3c3a3b7e: am 79b9bfe5: Notification listeners can be enabled in ↵Daniel Sandler2013-04-053-0/+335
|\ \ | |/ | | | | | | | | | | Settings>Security. * commit '3c3a3b7eb0b7d8df49d823aa74de2e868f0e189b': Notification listeners can be enabled in Settings>Security.
| * Notification listeners can be enabled in Settings>Security.Daniel Sandler2013-04-053-0/+335
| | | | | | | | | | | | | | Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS. Bug: 8454150 Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
* | am 861b2242: am e44f5e2b: Reference new StatusBarNotification and ↵Daniel Sandler2013-04-051-3/+5
|\ \ | |/ | | | | | | | | | | INotificationListener packages. * commit '861b224281f60fffb171a7dd297328efbe09fc9b': Reference new StatusBarNotification and INotificationListener packages.
| * Reference new StatusBarNotification and INotificationListener packages.Daniel Sandler2013-04-051-3/+5
| | | | | | | | | | | | | | Requires change I1be46f82 in f/b. Bug: 8199624 Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa
* | am 3c6c45f9: am a95604de: Merge "Adding developer toggle for using Chromium ↵Kristian Monsen2013-04-051-0/+31
|\ \ | |/ | | | | | | | | | | WebView." into jb-mr2-dev * commit '3c6c45f931307af098e790e86b114c804655f42b': Adding developer toggle for using Chromium WebView.
| * Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-devKristian Monsen2013-04-051-0/+31
| |\
| | * Adding developer toggle for using Chromium WebView.Jared Duke2013-03-281-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | This is hidden by default, and only revealed in device configurations that contain the Chromium WebView implementation. BUG=8383477 Change-Id: I8fbb0bb55776e384b9bfc4feb6a2d30eed114ece
* | | am 66fe9882: am e68959de: Merge "More fix for bug #8505156 WiFi properties ↵Fabrice Di Meglio2013-04-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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
| * | Merge "More fix for bug #8505156 WiFi properties dialog is having some ↵Fabrice Di Meglio2013-04-041-1/+1
| |\ \ | | | | | | | | | | | | issues in RTL mode" into jb-mr2-dev
| | * | More fix for bug #8505156 WiFi properties dialog is having some issues in ↵Fabrice Di Meglio2013-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL mode - use setPaddingRelative() instead of setPadding() - add missing android:textAlignment="viewStart" Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
* | | | am 456eadd9: am 58f9cbd6: Merge "pre-provide the mvno data of the edited ↵Robert Greenwalt2013-04-021-3/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | apn" into jb-mr2-dev * commit '456eadd9feb4b570ba59c6cbbd43013484d31f62': pre-provide the mvno data of the edited apn
| * | | Merge "pre-provide the mvno data of the edited apn" into jb-mr2-devRobert Greenwalt2013-04-021-3/+18
| |\ \ \ | | |/ / | |/| |
| | * | pre-provide the mvno data of the edited apnSungmin Choi2013-04-011-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am e427ccdc: am 8d9b07ed: Merge "When user has DISALLOW_USB_FILE_TRANSFER ↵Maggie Benthall2013-04-012-8/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | set, disable settings controls." into jb-mr2-dev * commit 'e427ccdce304a8afe8ebb493d60e94de56acedb3': When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
| * | | Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings ↵Maggie Benthall2013-04-012-8/+24
| |\ \ \ | | | | | | | | | | | | | | | controls." into jb-mr2-dev
| | * | | When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.Maggie Benthall2013-03-292-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 52d9a78f: am cb7b0b77: Better app filtering for limited usersAmith Yamasani2013-03-311-12/+49
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '52d9a78f2241b62e6fa1ce9e07777d7c8e30af96': Better app filtering for limited users
| * | | | Better app filtering for limited usersAmith Yamasani2013-03-311-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show all system apps that have launchers and widgets. Show all downloaded apps. Remove dupes by package name. Change-Id: Ief59b057e55a55e48ef48c5a638f6daf6a952e4e
* | | | | am b19daff9: am 2601cd91: Implement proper settings restrictionsAmith Yamasani2013-03-314-203/+176
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b19daff9cb6f04a71343f858a0c44415412b8049': Implement proper settings restrictions
| * | | | Implement proper settings restrictionsAmith Yamasani2013-03-314-203/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings restrictions for limited users translate to user restrictions specified in UserManager. Added required strings. TODO: Add NFC restriction. Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
* | | | | am fe44098d: am 732c80ff: Remove Limited users category if emptyAmith Yamasani2013-03-291-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fe44098dd126af1a19fe3e29e35506a07bc05c62': Remove Limited users category if empty
| * | | | Remove Limited users category if emptyAmith Yamasani2013-03-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no users under limited category, in a secondary user, remove the subheading completely. Change-Id: I0397b6198c8cfc147e9e7dc30a92a7cb2f5860e3
* | | | | am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" ↵Amith Yamasani2013-03-293-53/+131
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '26aca80eb1813cfe69450383efd8442805b16da5': Follow changes to RestrictionEntry API
| * | | | Merge "Follow changes to RestrictionEntry API" into jb-mr2-devAmith Yamasani2013-03-303-53/+131
| |\ \ \ \
| | * | | | Follow changes to RestrictionEntry APIAmith Yamasani2013-03-293-53/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement custom restrictions activity. Fixed some bugs. Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
* | | | | | am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-devKenny Root2013-03-291-2/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ab6a6645b01312816fe0688c76b5a26948252850': Add KeyStore storage type to Settings UI
| * | | | | Merge "Add KeyStore storage type to Settings UI" into jb-mr2-devKenny Root2013-03-291-2/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add KeyStore storage type to Settings UIKenny Root2013-03-291-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give the user an idea of what kind of credential storage is in use on this device for keystore daemon. (cherry picked from commit 39b56008be0ad0b50fd65ec8fc1c6f9d81d60959) Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2
* | | | | | am 0f41b49d: Add install support for WIFI UIDIrfan Sheriff2013-03-292-1/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '0f41b49d1f33e86ec4e7004f009c074b68a90be6': Add install support for WIFI UID
| * | | | | Add install support for WIFI UIDIrfan Sheriff2013-03-292-1/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 8472221 Change-Id: If203760fc960b4d8987d745e49ef1d4355c45adf
* | | | | am 899e4f27: Merge "Display vibrate icon in volume menu" into jb-mr2-devEric Laurent2013-03-281-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '899e4f27f1866acee29c67e6f19b50308a3b12c3': Display vibrate icon in volume menu
| * | | | Merge "Display vibrate icon in volume menu" into jb-mr2-devEric Laurent2013-03-281-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Display vibrate icon in volume menuEric Laurent2013-03-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a tablet is in vibrate mode, the notification volume icon in the volume menu should be vibrate and not silent. Bug 7235006 Change-Id: I460a579a7796f8fb2cac8ff581a98f23e57d1bb0
* | | | | am a8645309: am 0d52fc18: am 9dc478ec: Merge "Add ability to install ↵Kenny Root2013-03-281-7/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | credentials as other UID" * commit 'a86453096979d027d65390f657568c945fea1b3d': Add ability to install credentials as other UID
| * | | | am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other ↵Kenny Root2013-03-281-7/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UID" * commit '0d52fc184defef46378e7ba095091c7bab1ee459': Add ability to install credentials as other UID
| | * | | | Add ability to install credentials as other UIDKenny Root2013-03-281-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the ability to install from the system UID to wifi UID to explicitly bind WiFi credentials to the WiFi profile. This adds the ability for Wifi Settings to invoke installation of a PKCS12 file for the wifi UID. Bug: 8183258 Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
* | | | | | am 02e8ca3e: Merge "Respect user restrictions about adding/removing ↵Maggie Benthall2013-03-286-17/+55
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accounts, sideloading" into jb-mr2-dev * commit '02e8ca3e9ad966bd523241aaa1eecf58865027a8': Respect user restrictions about adding/removing accounts, sideloading
| * | | | | Merge "Respect user restrictions about adding/removing accounts, ↵Maggie Benthall2013-03-286-17/+55
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | sideloading" into jb-mr2-dev
| | * | | | | Respect user restrictions about adding/removing accounts, sideloadingMaggie Benthall2013-03-276-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide or disable options in the settings app when the user is restricted from making changes. Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings. Remove sideloading checkbox in SecuritySettings. Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string. Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe
* | | | | | | am 0fb0d016: Merge "Split User settings into limited and trusted." into ↵Amith Yamasani2013-03-274-25/+231
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '0fb0d016dd51b0d8b882d92de58f5c2ea28a9208': Split User settings into limited and trusted.
| * | | | | | Merge "Split User settings into limited and trusted." into jb-mr2-devAmith Yamasani2013-03-274-25/+231
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Split User settings into limited and trusted.Amith Yamasani2013-03-274-25/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also show avatars with the circular frame like on lockscreen. Change-Id: I032d842555b2f50a07166460f9cfb1963366dbb1
* | | | | | | am 05d67f62: Merge "Allow wildcard for bypass proxy" into jb-mr2-devIrfan Sheriff2013-03-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '05d67f62b7370b3bbe3bf691ae01b8a46dd04606': Allow wildcard for bypass proxy
| * | | | | | Merge "Allow wildcard for bypass proxy" into jb-mr2-devIrfan Sheriff2013-03-261-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Allow wildcard for bypass proxyIrfan Sheriff2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow *.example.com to be bypassed Bug: 7422561 Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb
* | | | | | | am 86ecd3c4: Merge "Device Admin Settings changes for Device Owner" into ↵Amith Yamasani2013-03-262-3/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '86ecd3c437be3478ee17347df46ae53af0eef5ba': Device Admin Settings changes for Device Owner
| * | | | | | Merge "Device Admin Settings changes for Device Owner" into jb-mr2-devAmith Yamasani2013-03-262-3/+20
| |\ \ \ \ \ \
| | * | | | | | Device Admin Settings changes for Device OwnerAmith Yamasani2013-03-262-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the list entry for an active device owner, as it can't be deactivated. Change-Id: I833561f91ae60dff8226f9118c9e3b012e5e194f