summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Don't auto-focus text fields in hotspot dialogJason Monk2015-06-151-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead focus the parent, so that the fields can be seen on smaller screens before editing. Bug: 19095568 Change-Id: Ifeacce3ed64c370ff414e81bd4d25c5d0b26712c
* | | | Merge "Fix bad USB configuration under Developer Options" into mnc-devNick Kralevich2015-06-131-0/+3
|\ \ \ \
| * | | | Fix bad USB configuration under Developer OptionsNick Kralevich2015-06-121-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The USB configuration screen under Developer Options hasn't been updated for the new USB access control changes. Update it. 1) Ensure that the default in Development Settings is "Charger Only". 2) Changing USB mode in developer settings only changes the USB function. It doesn't unlock any USB data. Bug: 21258972 Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
* | | | Merge "Added an introduction to the fingerprint enrollment" into mnc-devSelim Cinek2015-06-122-0/+93
|\ \ \ \
| * | | | Added an introduction to the fingerprint enrollmentSelim Cinek2015-06-112-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21468315 Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
* | | | | Merge "Promote "add service" from menu to list item" into mnc-devMakoto Onuki2015-06-121-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Promote "add service" from menu to list itemMakoto Onuki2015-06-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also show the app icon for each service. Bug 19914125 Change-Id: I592c526746a3ec9f67e8e8a6c6f1530e7724e310
* | | | | Merge "Ensure text is visible when choosing pattern" into mnc-devAdrian Roos2015-06-121-6/+6
|\ \ \ \ \
| * | | | | Ensure text is visible when choosing patternAdrian Roos2015-06-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21639578 Change-Id: Ib948411b3087c752a36ed6f853915e59946c0988
* | | | | | Merge "Refine fingerprint enrollment experience" into mnc-devJorim Jaggi2015-06-119-10/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Refine fingerprint enrollment experienceJorim Jaggi2015-06-119-10/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Flash fingerprint graphic when enrollment progresses - Show hint message when not progressing for a few seconds - Make sure animation is always working Bug: 21617091 Bug: 21644138 Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
* | | | | | Merge "String changes for Cellular data toggle summary." into mnc-devSanket Padawe2015-06-111-0/+2
|\ \ \ \ \ \
| * | | | | | String changes for Cellular data toggle summary.Sanket Padawe2015-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17073752 Change-Id: I61974ab3b2b2136aa5eb5027fc826d635a705ed1
* | | | | | | Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-devSanket Padawe2015-06-111-0/+2
|\ \ \ \ \ \ \
| * | | | | | | String changes for PBAP chekcbox in BT pairing dialog.Sanket Padawe2015-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20488109 Change-Id: I922477c94cbf9c4042d8a895eb10a41da2783f14
* | | | | | | | Merge "Clean up settings shortcuts" into mnc-devJason Monk2015-06-113-0/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Clean up settings shortcutsJason Monk2015-06-113-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove some bad entries - Fix icons to be top-level item specific - Add memory Bug: 20632230 Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
* | | | | | | | Fix button layout issue for sv-SE locale.Sanket Padawe2015-06-111-1/+1
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21479378 Change-Id: I4858958a26b183461490c052fece66941314edcc
* | | | | | | Merge "Slow dialog string has no limit." into mnc-devJeff Sharkey2015-06-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Slow dialog string has no limit.Jeff Sharkey2015-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21342398 Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
* | | | | | | Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into ↵Lorenzo Colitti2015-06-111-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | Add a string for switching to cell when Wi-Fi loses backhaul.Lorenzo Colitti2015-06-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have not yet decided whether to surface this setting, but we need to get it in before string freeze in case we do want to expose it. Bug: 20896761 Change-Id: I1c99229a284a0ae86ab191ae90a7dff497984fea
* | | | | | | | Merge "Added setting strings for new fingerprint introduction screen" into ↵Selim Cinek2015-06-111-1/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | mnc-dev
| * | | | | | | Added setting strings for new fingerprint introduction screenSelim Cinek2015-06-101-1/+13
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21468315 Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
* | | | | | | New strings!Jeff Sharkey2015-06-101-13/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21737573, 21666225, 21756698, 21737666, 21471429 Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0
* | | | | | | Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" ↵Lajos Molnar2015-06-102-10/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | developer settings: remove "Use deprecated AwesomePlayer" settingsLajos Molnar2015-06-102-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17108024 Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
* | | | | | | | Merge "Animations/success state for external confirm device credentials ↵Jorim Jaggi2015-06-107-1/+129
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | (2/2)" into mnc-dev
| * | | | | | | Animations/success state for external confirm device credentials (2/2)Jorim Jaggi2015-06-107-1/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20929186 Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
* | | | | | | | Merge "New dialog for ignore battery optimizations" into mnc-devJason Monk2015-06-101-0/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | New dialog for ignore battery optimizationsJason Monk2015-06-101-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21375688 Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
* | | | | | | | | Add string for profile owner usage access warningJason Monk2015-06-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20751702 Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
* | | | | | | | | Merge "Add simulated 4K display modes." into mnc-devJeff Brown2015-06-101-9/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Add simulated 4K display modes.Jeff Brown2015-06-091-9/+17
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18241736 Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
* | | | | | | | Merge "Implement default assist app setting" into mnc-devXiyuan Xia2015-06-105-10/+70
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement default assist app settingXiyuan Xia2015-06-105-10/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add "None" support to AppListPreference - Add DefaultAssistPreference to manage assist; - Add AppListPreferenceWithSettings to show a settings icon; - Implement DefaultAssistPreference based on AppListPreferenceWithSettings; - Move voice input settings into ManageAssist and implement it based on AppListPreferenceWithSettings; Bug:20210110 Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302
* | | | | | | | | Merge "Show list of permissions instead of just numbers" into mnc-devMakoto Onuki2015-06-101-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Show list of permissions instead of just numbersMakoto Onuki2015-06-081-0/+12
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21615746 Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
* | | | | | | | Merge changes from topic 'no-internet-notification' into mnc-devLorenzo Colitti2015-06-101-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Pass in the netId using intent data, not intent extras. Reword "no internet access" dialog to conform with mocks.
| * | | | | | | Reword "no internet access" dialog to conform with mocks.Lorenzo Colitti2015-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20081183 Bug: 20739299 Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
* | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-1084-2449/+3499
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-1084-2449/+3499
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68 Auto-generated-cl: translation import
* | | | | | | | Fix legal info back buttonJason Monk2015-06-102-53/+73
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it its own SettingsPreferenceFragment. whitespace-- Bug: 20727881 Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
* | | | | | | Remove periods from ignore optimizations summariesJason Monk2015-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21375688 Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
* | | | | | | Merge "Advanced apps updates (2/2)" into mnc-devJason Monk2015-06-102-7/+13
|\ \ \ \ \ \ \
| * | | | | | | Advanced apps updates (2/2)Jason Monk2015-06-092-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the title of the screen, add a category to break things up Bug: 21372377 Change-Id: I03c2060937f540235755e4b74c5634543e526d25
* | | | | | | | Merge "Add sd card string, just in case" into mnc-devJason Monk2015-06-101-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add sd card string, just in caseJason Monk2015-06-091-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21471429 Change-Id: Iac3cd1643b8aa3a62a0c97c8046cb365dfeaf527
* | | | | | | SAP: Make it possible to enforce a 16-digit pin code (5/5)Casper Bonde2015-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enable the posibility to enforce using a 16-digit pin or MITM for a RFCOMM or L2CAP connection. This is needed for the SIM access profile. Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea Signed-off-by: Casper Bonde <c.bonde@samsung.com>
* | | | | | | Merge "Top level: "Storage" -> "Storage & USB"" into mnc-devJason Monk2015-06-092-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |