summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Layout refinement for app lists" into mnc-devJason Monk2015-06-1612-193/+174
|\ \ \ \ \
| * | | | | Layout refinement for app listsJason Monk2015-06-1612-193/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all app lists (or at least all current app lists) use the same base layout for icon, label, and sizing/padding. This way they should look the same. Bug: 21727125 Bug: 21726922 Bug: 21853632 Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
* | | | | | Merge "More storage UI updates." into mnc-devJeff Sharkey2015-06-168-15/+248
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | More storage UI updates.Jeff Sharkey2015-06-158-15/+248
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage volumes now have headers with larger fonts and progress bars to show used versus free space. Updated Memory to use new formatting template, and Data Usage to use consistent display logic. Allocate a unique color for each private volume, and yell when a volume is running low on space. Update private volume details to launch into MediaStore-backed storage backends in a management mode, and only show detailed items when hosting emulated storage. Show details dialog about "Other" and user storage items. Shortcut into single private volume when it's the only device. Add real eject icon. Bug: 21756698, 20275574, 21326612 Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
* | | | | Limit number of fingerprint templates that can be enrolled per device userJim Miller2015-06-151-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change places an upper limit on the number of fingerprint templates that can be enrolled per account. This is done primarily for performance reasons, but may also be imposed by hardware and Trusted Execution Environment (TEE) reasons. Fixes bug 20731847 Change-Id: I3975290fa8eb2106467493aab6102015697e012c On branch max_fingerprint
* | | | | Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-devJohn Spurlock2015-06-153-142/+0
|\ \ \ \ \
| * | | | | Settings: Remove unreachable "Battery Info" screen.John Spurlock2015-06-153-142/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 21576824 Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
* | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-15154-4510/+9710
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-15154-4510/+9710
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ifda55ef8db028d95b618b0a44dbe4d2c3c212f44 Auto-generated-cl: translation import
* | | | | Merge "Fix bad theming on owner-info" into mnc-devJason Monk2015-06-151-2/+1
|\ \ \ \ \
| * | | | | Fix bad theming on owner-infoJason Monk2015-06-151-2/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 21784828 Change-Id: I18c7ef71efd9549ffb2207b66d04162cd32e35a5
* | | | | 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.