summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "Disable apps that require an account on a limited user" into jb-mr2-devAmith Yamasani2013-04-131-0/+2
| |\ \
| | * | Disable apps that require an account on a limited userAmith Yamasani2013-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app is marked as requiring an account to work, disable that app and show a message in the summary. Also, implement graying out of icons for deselected apps. Bug: 8600261 Change-Id: I9cf48832675c24257e09addad4316249082c30fb
| * | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-04-1249-757/+634
| |\ \ \ | | |/ / | |/| |
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-04-1249-757/+634
| | |/ | | | | | | | | | | | | Change-Id: I55d1e2ad4c165c7098054dadaa79ea3e6896fc89 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-04-1249-757/+634
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-1249-757/+634
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie2925e861248befe59ee0a356424786a616774f6 Auto-generated-cl: translation import
* | | | am 5cc298c8: am 8c32c28f: Merge "Implement Settings app UX for when a user ↵Maggie Benthall2013-04-121-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | has wifi config locked down." into jb-mr2-dev * commit '5cc298c838e8fa6dd540624fa354e7d2fab16f92': Implement Settings app UX for when a user has wifi config locked down.
| * | Implement Settings app UX for when a user has wifi config locked down.Maggie Benthall2013-04-111-0/+2
| |/ | | | | | | | | | | | | | | | | | | When the user is restricted from configuring wifi: - Leave the on/off button enabled - Hide all menu options - Hide all networks, and display a message saying: "This user is not allowed to configure wireless networks." Change-Id: I20193b552ea071740686bd9091637459e9b668b5
* | am 7805d74c: am d81a3f73: Improve app list for limited usersAmith Yamasani2013-04-101-0/+2
|\ \ | |/ | | | | | | * commit '7805d74cd7710c868bdebae872c79470b622c86f': Improve app list for limited users
| * Improve app list for limited usersAmith Yamasani2013-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Import translations. DO NOT MERGEBaligh Uddin2013-04-109-91/+71
| | | | | | | | | | Change-Id: Ifb727fcd1cfd28e78a2f405ee5cbba21e1999ab3 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-04-109-91/+71
| | | | | | | | | | Change-Id: Id2b91f9699560cd2f7a4858c9b96c8782a6a0601 Auto-generated-cl: translation import
* | am 0c8f9246: am 80b1dfe4: Merge "Select text in user name dialog" into ↵Amith Yamasani2013-04-091-1/+1
|\ \ | |/ | | | | | | | | | | jb-mr2-dev * commit '0c8f9246437234a0de217feb339c5811012bea5c': Select text in user name dialog
| * Merge "Select text in user name dialog" into jb-mr2-devAmith Yamasani2013-04-101-1/+1
| |\
| | * Select text in user name dialogAmith Yamasani2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Enables quickly changing the name without moving the cursor. Also use cap words style. Bug: 8518507 Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
* | | am 9f5f4fdd: am 460f2478: Merge "Add FW support for CellInfo RIL commands." ↵Wink Saville2013-04-091-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr2-dev * commit '9f5f4fdde61fabb634885e71f845d8d3c1fc9c7b': Add FW support for CellInfo RIL commands.
| * | Merge "Add FW support for CellInfo RIL commands." into jb-mr2-devWink Saville2013-04-091-0/+8
| |\ \
| | * | Add FW support for CellInfo RIL commands.Wink Saville2013-04-081-0/+8
| | |/ | | | | | | | | | | | | | | | | | | Add being able to setCellInfoListRate. Bug: 8235566 Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
| * | Import translations. DO NOT MERGEBaligh Uddin2013-04-0849-3/+787
| |/ | | | | | | | | Change-Id: Ib3ac2b538aa44464e84db39d318f828b656eb759 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-04-0849-3/+787
| | | | | | | | | | Change-Id: Ia600f0bea337c6a06f9fa46c62ca4ff2b164c6e6 Auto-generated-cl: translation import
* | am 3c3a3b7e: am 79b9bfe5: Notification listeners can be enabled in ↵Daniel Sandler2013-04-054-0/+152
|\ \ | |/ | | | | | | | | | | Settings>Security. * commit '3c3a3b7eb0b7d8df49d823aa74de2e868f0e189b': Notification listeners can be enabled in Settings>Security.
| * Notification listeners can be enabled in Settings>Security.Daniel Sandler2013-04-054-0/+152
| | | | | | | | | | | | | | Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS. Bug: 8454150 Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
| * Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-04-0511-204/+106
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-04-0511-204/+106
| | | | | | | | | | | | | | | Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-04-0511-204/+106
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-0511-204/+106
| | | | | | | | | | | | | | | | | | | | Change-Id: I841d6ddb3797a3a84dc53f5139351232e6a6a5da Auto-generated-cl: translation import
* | | | am 3c6c45f9: am a95604de: Merge "Adding developer toggle for using Chromium ↵Kristian Monsen2013-04-052-0/+10
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | 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-052-0/+10
| |\ \ | | |/ | |/|
| | * Adding developer toggle for using Chromium WebView.Jared Duke2013-03-282-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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/+2
| |\ \ | | | | | | | | | | | | 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/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL mode - use setPaddingRelative() instead of setPadding() - add missing android:textAlignment="viewStart" Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-0349-762/+953
| |/ / | | | | | | | | | | | | Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1 Auto-generated-cl: translation import
| * | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-04-0149-1339/+1197
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-03-2949-1339/+1197
| | | | | | | | | | | | | | | | | | | | Change-Id: I846ec473107cdeeb6573445d8faa60ab83fa6946 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-0349-762/+953
| | | | | | | | | | | | | | | | | | | | Change-Id: I3eddc5b7fbb017c3e3b4029a7cb93a87c9c11f06 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-04-0149-1339/+1197
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2949-1339/+1197
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I709c77b2c45763a2090875189d88c65d28903030 Auto-generated-cl: translation import
* | | | | am b19daff9: am 2601cd91: Implement proper settings restrictionsAmith Yamasani2013-03-311-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'b19daff9cb6f04a71343f858a0c44415412b8049': Implement proper settings restrictions
| * | | | Implement proper settings restrictionsAmith Yamasani2013-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings restrictions for limited users translate to user restrictions specified in UserManager. Added required strings. TODO: Add NFC restriction. Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f
* | | | | am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" ↵Amith Yamasani2013-03-291-0/+21
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | into jb-mr2-dev * commit '26aca80eb1813cfe69450383efd8442805b16da5': Follow changes to RestrictionEntry API
| * | | Merge "Follow changes to RestrictionEntry API" into jb-mr2-devAmith Yamasani2013-03-301-0/+21
| |\ \ \ | | |/ / | |/| |
| | * | Follow changes to RestrictionEntry APIAmith Yamasani2013-03-291-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-0/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ab6a6645b01312816fe0688c76b5a26948252850': Add KeyStore storage type to Settings UI
| * | | Merge "Add KeyStore storage type to Settings UI" into jb-mr2-devKenny Root2013-03-292-0/+11
| |\ \ \
| | * | | Add KeyStore storage type to Settings UIKenny Root2013-03-292-0/+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 fee612df: Merge "Fix bug #8505156 WiFi properties dialog is having some ↵Fabrice Di Meglio2013-03-291-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | issues in RTL mode" into jb-mr2-dev * commit 'fee612df197ab3da969dff39ecc3df95b931cfae': Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
| * | | Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL ↵Fabrice Di Meglio2013-03-291-1/+2
| |\ \ \ | | | | | | | | | | | | | | | mode" into jb-mr2-dev
| | * | | Fix bug #8505156 WiFi properties dialog is having some issues in RTL modeFabrice Di Meglio2013-03-281-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | - title should be "viewStart" - link speed should be also "viewStart" Change-Id: Ic0389a1e4ddf1b1d6fc1fcbeba50074434fdb52d
* | | | am 0f41b49d: Add install support for WIFI UIDIrfan Sheriff2013-03-292-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0f41b49d1f33e86ec4e7004f009c074b68a90be6': Add install support for WIFI UID