summaryrefslogtreecommitdiffstats
path: root/res/values
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update disable dialog" into mnc-devJason Monk2015-06-221-4/+4
|\
| * Update disable dialogJason Monk2015-06-181-4/+4
| | | | | | | | | | Bug: 20826933 Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00
* | Add content description to owner info status textJason Monk2015-06-191-0/+3
| | | | | | | | | | Bug: 21799551 Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
* | Merge "Clarify process_dex2oat_label description" into mnc-devBrian Carlstrom2015-06-191-1/+1
|\ \
| * | Clarify process_dex2oat_label descriptionBrian Carlstrom2015-06-181-1/+1
| |/ | | | | | | | | Bug: 21898104 Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
* | Increase char limit of the data usage Settings string to 33.Sanket Padawe2015-06-181-1/+1
| | | | | | | | | | Bug: 21801556 Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
* | Merge "Revert "Accounts -> Account sync"" into mnc-devJason Monk2015-06-181-2/+2
|\ \ | |/ |/|
| * Revert "Accounts -> Account sync"Jason Monk2015-06-181-2/+2
| | | | | | | | | | | | | | This reverts commit 43db745ea0bdb3f8cb2737e74ffcad1d381b4a2b. Bug: 21726868 Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
* | Merge "Fix issue with german translation of lock times" into mnc-devJim Miller2015-06-161-0/+2
|\ \
| * | Fix issue with german translation of lock timesJim Miller2015-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The word "immediately" would go into a different place in the sentence than a number so we have to break this into two strings. Fixes bug 21602326 Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
* | | Merge "dex2oat should show something friendlier in Settings -> Battery" into ↵Brian Carlstrom2015-06-161-2/+4
|\ \ \ | | | | | | | | | | | | mnc-dev
| * | | dex2oat should show something friendlier in Settings -> BatteryBrian Carlstrom2015-06-121-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 13161823 Change-Id: If68d91900c88f33f5656a9e336633d53a5e900ce
* | | | Finish storage wizard theming.Jeff Sharkey2015-06-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage wizard screens now have updated assets from UX, and various assets are tinted consistently. We're using our own navigation bar and wholesale replacing the layout from upstream. Fix text colors in night mode. Tell SystemUI when we're finished with the wizard flow. Bug: 21830731 Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
* | | | Merge "Update for shortcuts" into mnc-devJason Monk2015-06-161-0/+3
|\ \ \ \
| * | | | Update for shortcutsJason Monk2015-06-161-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
* | | | | Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-devSanket Padawe2015-06-161-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add PBAP checkbox for BT pairing consent dialog.Sanket Padawe2015-06-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20488109 Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
* | | | | Merge "Layout refinement for app lists" into mnc-devJason Monk2015-06-162-1/+6
|\ \ \ \ \
| * | | | | Layout refinement for app listsJason Monk2015-06-162-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | More storage UI updates.Jeff Sharkey2015-06-151-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Settings: Remove unreachable "Battery Info" screen.John Spurlock2015-06-151-56/+0
|/ / / / | | | | | | | | | | | | | | | | Bug: 21576824 Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
* | | | 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-121-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Added an introduction to the fingerprint enrollmentSelim Cinek2015-06-111-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 21468315 Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
* | | | Merge "Refine fingerprint enrollment experience" into mnc-devJorim Jaggi2015-06-113-0/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Refine fingerprint enrollment experienceJorim Jaggi2015-06-113-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-111-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clean up settings shortcutsJason Monk2015-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove some bad entries - Fix icons to be top-level item specific - Add memory Bug: 20632230 Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
* | | | | | 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-101-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | developer settings: remove "Use deprecated AwesomePlayer" settingsLajos Molnar2015-06-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17108024 Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
* | | | | | | Merge "Animations/success state for external confirm device credentials ↵Jorim Jaggi2015-06-102-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | (2/2)" into mnc-dev
| * | | | | | Animations/success state for external confirm device credentials (2/2)Jorim Jaggi2015-06-102-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20929186 Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
* | | | | | | 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-101-2/+31
|\ \ \ \ \ \ \