summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix bug #16800261 Settings app: Device administrator screen padding ↵Fabrice Di Meglio2014-08-062-2/+3
|\ | | | | | | issue" into lmp-dev
| * Fix bug #16800261 Settings app: Device administrator screen padding issueFabrice Di Meglio2014-08-062-2/+3
| | | | | | | | | | | | | | | | - remove listPreferredItemPaddingStart / listPreferredItemPaddingEnd from the ListView and add it to the list item - add missing 8dp end padding for the icon Change-Id: I78696e5ee8e243771d23c86fa178de2f60b5c88d
* | Merge "Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-devDan Sandler2014-08-052-10/+10
|\ \
| * | Track moved Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS.Dan Sandler2014-08-062-10/+10
| | | | | | | | | | | | | | | Bug: 15331132 Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
* | | Merge "Replace missing resource." into lmp-devDan Sandler2014-08-051-0/+3
|\ \ \ | |/ /
| * | Replace missing resource.Dan Sandler2014-08-061-0/+3
| | | | | | | | | | | | | | | Bug: 16833578 Change-Id: I9ad1dc992577f6bfdc9d1201b6c13591a32f3fc8
* | | Merge "Fix bug #16712121 Add 'Experimental' substring to 'High contrast ↵Fabrice Di Meglio2014-08-062-0/+5
|\ \ \ | |/ / |/| | | | | text'" into lmp-dev
| * | Fix bug #16712121 Add 'Experimental' substring to 'High contrast text'Fabrice Di Meglio2014-08-062-0/+5
| |/ | | | | | | | | | | - add "(Experimental)" as a summary text for "High contrast text" Change-Id: I6faf1ea382e90a4f0dffcc8a093e4aa5a4653d23
* | Merge "Clears previously added cross-profile-intents" into lmp-devAlexandra Gherghina2014-08-051-1/+4
|\ \
| * | Clears previously added cross-profile-intentsAlexandra Gherghina2014-07-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clears the old cross-profile intent filters added by the Settings app. This makes sure we do not have duplicates and also that there are no outdated intents being forwarded (intents that do not exist any more). Bug: 16647771 Change-Id: Ief4f7341e3f984b9435a9757bf469e53227ce2bf
* | | Merge "Fix issue #16537318: clarify voice interaction strings." into lmp-devDianne Hackborn2014-08-041-2/+6
|\ \ \
| * | | Fix issue #16537318: clarify voice interaction strings.Dianne Hackborn2014-08-051-2/+6
| | | | | | | | | | | | | | | | Change-Id: I7e2c379e28447fa83ecf9c53b064d7917253b880
* | | | Add support for widgets in user profilesSvet Ganov2014-08-051-14/+26
| |_|/ |/| | | | | | | | | | | | | | bug:14991269 Change-Id: I7f71787bf5e5278230063b9d3bafac96a0680682
* | | Merge "Ask about redacted notifications after setting up a secure lock" into ↵Adrian Roos2014-08-056-0/+176
|\ \ \ | | | | | | | | | | | | lmp-dev
| * | | Ask about redacted notifications after setting up a secure lockAdrian Roos2014-08-056-0/+176
| | | | | | | | | | | | | | | | | | | | Bug: 14437890 Change-Id: I54cf355242375e8c7968c7d27c441fbd0a54cef2
* | | | Settings: New application-level notification settings.John Spurlock2014-08-0518-825/+896
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Convert the old application-level dialog to an activity. - Move the settings icon to the new activity (out of the list). - Add a custom application header, similar to the switch bar style. - Use the ubiquitous vector gear for the settings icon. - Migrate old checkboxes to switch prefs, add new summaries. - Remove obsolete artifacts. Bug:16396715 Change-Id: I857e3cf448b79f44fe1c242e6020f5214434c00c
* | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-08-0573-3887/+3078
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-08-0473-3887/+3078
| | | | | | | | | | | | | | | | | | | | Change-Id: If24e248354ae999208643fb8f91b0c0a9e7de233 Auto-generated-cl: translation import
* | | | Radio Information UI for enabling/disabling debug settings of MO over VoLTEEtan Cohen2014-08-043-0/+46
| | | | | | | | | | | | | | | | Change-Id: Ib05ff460ac6001c511113e80a63707a073908637
* | | | Merge "[WifiSetup] Fixed setup strings CHAR LIMIT" into lmp-devMaurice Lam2014-08-011-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | [WifiSetup] Fixed setup strings CHAR LIMITMaurice Lam2014-08-041-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | Bumped the CHAR LIMIT of "Skip" button to 20, and added the same CHAR LIMIT to "Next". Bug: 16116325 Change-Id: Iafdab3712fdbfac0c53d3ef73d1da8910bc9433b
* | | Settings: Wire up new doze opt-out setting.John Spurlock2014-08-043-0/+45
|/ / | | | | | | | | | | | | | | | | Add an item in Display settings for enabling or disabling dozing. The setting will only appear on devices that have configured a doze component. Bug:16703536 Change-Id: Iba5f0a25cef68924f5be5f858b4c396234a7a355
* | Merge "Bluetooth: Multi HF support" into lmp-devMatthew Xie2014-08-011-12/+21
|\ \
| * | Bluetooth: Multi HF supportNitin Srivastava2014-08-031-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The connected sinks are not disconnected from HeadsetProfile when new sink is connecting. 2. Also return correct connection status for specific HS. 3. Sets priority for specific HS while disconnecting. bug 16519158 Change-Id: I62c6629cf11129733aab8a835adcd51e014b3860
* | | Updated comments in strings.xml for translators.PauloftheWest2014-08-031-2/+4
| | | | | | | | | | | | | | | | | | Bug: 16321904 Bug: 16340357 Change-Id: I5e4a854742a1f4e51c7aed2e786b2436260795ec
* | | Settings: Battery saver updates.John Spurlock2014-08-024-41/+57
|/ / | | | | | | | | | | | | | | | | | | | | - Fewer trigger level options, new default of 0 (never) - Use new shared feature description text (in framework) - Remove "always on", add new top-level switch bar. Depends on the framework changes in I3d1ded1eec9e63e7d97469486f6a320e1bebbccd Bug:16214395 Change-Id: Ia01186cfeb19d00672f62cc84787584b4dcc1143
* | Toggle between profiles in VPN SettingsZoltan Szatmary-Ban2014-08-011-1/+48
| | | | | | | | | | | | | | | | | | This adds a spinner to the VPN settings screen which can be used to toggle between the Settings app in the primary and managed profile so that the user can edit settings belonging to both profiles. Bug:16030111 Change-Id: I3b800264c634900412e8eebdbcf43a2b6913c2be
* | Update Device Admins Settings screenZoltan Szatmary-Ban2014-08-012-90/+310
| | | | | | | | | | | | | | | | | | The MDM is a Device Admin for the managed profile. The users should be able to see that it exists and it is controlling the device, but they should not be able to change it. Bug: 15558397 Change-Id: Ief372b606f1085f73c98ace97f2c1d9ac5fe3257
* | Merge "The Settings app is listening to wpa_supplicant state change so as to ↵vandwalle2014-07-312-27/+4
|\ \ | | | | | | | | | update the state of the AccessPoint objects and present Wifi state to the user." into lmp-dev
| * | The Settings app is listening to wpa_supplicant state change so as to update ↵vandwalle2014-07-312-27/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the state of the AccessPoint objects and present Wifi state to the user. This is not right because wpa_supplicant states are transient (for instance when the WiFi Layer, at Layer 2, is going thru some harmless spurious disconnection cycle due to WiFi signal fluctuation). This cause the state of the WiFi Network to appear to be unstable to the user. Hence, I removed dependencies on wpa_supplicant internal state. In addition so as to improve debugging, I added the BSSID to the Wifi Verbose Logging string which is shown in wifi picker alongside the current network. This string only appear when a user goes into Developper Options and enable WiFi Verbose Logging. The below bug is an example of situation where a spurious disconnect (a coupld seconds) handled by wpa_supplicant can cause the WiFi Settings to indicate that the link is unstable. Bug:16140888 Wifi best network selection not smooth Change-Id: I0e7c6b86262b88ed993c46fcdcdbab4d9b1f5ea1
* | | Cheanged Call Manager's summary to be parameter.PauloftheWest2014-07-311-1/+1
| | | | | | | | | | | | | | | Bug: 16300328 Change-Id: I4a3a4a80060ac6d464adc5f666d02dabe635707c
* | | Merge "Removing lock screen app widget code" into lmp-devSvetoslav2014-07-253-654/+0
|\ \ \
| * | | Removing lock screen app widget codeSvetoslav2014-07-313-654/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature is no longer suppored and this change removes the related code from settings. Change-Id: I156107740f20b096f44fa2880ef6dcad9f311a73
* | | | Merge "Dialog on phone shouldn't say tablet" into lmp-devAmith Yamasani2014-07-301-1/+1
|\ \ \ \
| * | | | Dialog on phone shouldn't say tabletAmith Yamasani2014-07-311-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Bug: 14607100 Change-Id: I5c3e023b94697f58c61122d530abaed406862201
* | | | Fix UsageStats permissions in SettingsAdam Lesinski2014-07-311-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppOpsManager returns all permission for all users. We need to check that the permission we're getting is actually for our user. Change-Id: I8287d2dc1959d4a22c19ebb2d24136324e04cd2b
* | | | Extract common functionality for profile spinner into UtilsAlexandra Gherghina2014-07-314-47/+39
| | | | | | | | | | | | | | | | | | | | Bug: 16645615 Change-Id: Ic8928fff8294cd99eeb86b69b44b8e4128cadf92
* | | | Modify user spinner appearance to match mocksAlexandra Gherghina2014-07-313-12/+23
| | | | | | | | | | | | | | | | | | | | Bug: 16518801 Change-Id: I30aa65251d4a4aaa80dbde5881fc56fffb7d54f7
* | | | Update icon and text for a managed profileAlexandra Gherghina2014-07-313-8/+12
| |/ / |/| | | | | | | | | | | Bug: 16369104 Change-Id: I15d25910332d92e1638cdc63422e7e28c2f07d85
* | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-07-3075-2402/+2586
|\ \ \ | |/ / |/| |
| * | Import translations. DO NOT MERGEGeoff Mendal2014-07-3075-2402/+2586
| | | | | | | | | | | | | | | Change-Id: I1b93e4357544ff5ce9bf18351ed34009ba06c5f5 Auto-generated-cl: translation import
* | | Merge "Fixed crash when changing orientation in the Add Networks dialog." ↵PauloftheWest2014-07-302-4/+5
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | Fixed crash when changing orientation in the Add Networks dialog.PauloftheWest2014-07-302-4/+5
| |/ / | | | | | | | | | | | | Bug: 16479540 Change-Id: Ib42977b72039f49b5d5ae688c0b0ded1094b44e2
* | | Merge "Fix issue with pin prompt." into lmp-devJulia Reynolds2014-07-251-15/+3
|\ \ \
| * | | Fix issue with pin prompt.Julia Reynolds2014-07-301-15/+3
| |/ / | | | | | | | | | | | | | | | | | | The PIN prompt would reappear if the pin screen had been rotated 90 degrees before a user hit cancel/ok. Change-Id: Ia5f93aa7a857d46ba95775c85344fa9ff28a4a6b
* | | Update NotificationStation after NotificationListenerService API changeChristoph Studer2014-07-301-1/+1
| | | | | | | | | | | | Change-Id: Ia58c18657c44c0dd49b058ce5b581554889b08d5
* | | Merge "Work around an icu4c bug in TimeZoneNames::getDisplayName." into lmp-devElliott Hughes2014-07-241-1/+1
|\ \ \
| * | | Work around an icu4c bug in TimeZoneNames::getDisplayName.Elliott Hughes2014-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use America/Buenos_Aires instead of America/Argentina/Buenos_Aires because the latter doesn't get a localized exemplar location in any language. Bug: 16516823 Change-Id: I708288cdc7f8ec7975c8418225abfdca2163ddc5
* | | | Merge "Set new PBAP connections to always allow." into lmp-devPauloftheWest2014-07-301-1/+1
|\ \ \ \
| * | | | Set new PBAP connections to always allow.PauloftheWest2014-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13886947 Change-Id: I6ec612b803433db90992f5e4d1bac26311d90a84