summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." ↵Sanket Padawe2015-06-231-0/+1
|\ | | | | | | into mnc-dev
| * Fix display of "Contact sharing" option in Car kit for BT Settings.Sanket Padawe2015-06-221-0/+1
| | | | | | | | | | Bug: 21879473 Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
* | Ensure "default" and "none" caption colors are consistent w/ frameworkAlan Viverette2015-06-222-2/+3
| | | | | | | | | | | | | | Also enables scroll indicators in color grid dialog. Bug: 21602597 Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
* | Merge "Disable foreground opacity when using default foreground color" into ↵Alan Viverette2015-06-221-0/+1
|\ \ | | | | | | | | | mnc-dev
| * | Disable foreground opacity when using default foreground colorAlan Viverette2015-06-221-0/+1
| | | | | | | | | | | | | | | Bug: 21602597 Change-Id: Idad5288477f9ece46a2ccb768863d4fd528fec12
* | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-2277-818/+652
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-06-2277-818/+652
| | |/ | |/| | | | | | | | | | Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8 Auto-generated-cl: translation import
* | | 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
* | | Work around improper ListView recycling in TrustAgentSettingsAdrian Roos2015-06-191-1/+6
| |/ |/| | | | | | | | | | | | | | | Previously, the views for our SwitchPreference would never be recycled because they weren't present in onCreate, which broke accessibility events. Bug: 21837103 Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
* | 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 "Fix ListView being too eager too scroll" into mnc-devJason Monk2015-06-182-0/+34
|\ \
| * | Fix ListView being too eager too scrollJason Monk2015-06-182-0/+34
| |/ | | | | | | | | | | | | ListView is always too eager to scroll, so just stop using it. Bug: 21853796 Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
* | Merge "Enforce Keyguard policy in Notification Settings" into mnc-devAlex Chau2015-06-182-0/+2
|\ \
| * | Enforce Keyguard policy in Notification SettingsAlex Chau2015-06-182-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Applied getKeyguardDisabledFeatures for notification settings and notification setup page (after settings a screenlock) - If a notification settings is disabled, the next least secure setting will be chosen - Although KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS can be set be profile, it will not be reflected in both settings page. This is because it does not affect the owner (user 0), as mentioned in DevicePolicyManagerService.PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER - Skip RedactionInterstitial if there is <= 1 options for the user - Tested with both Setup wizard and settings case, both pattern and password, as well as toggling the policy on and off Bug: 19307118 Bug: 17099898 Change-Id: If640d5576caa0163e9942569f7b4643a30bbfe0a
* | 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 "Remove battery history graph from details screen" into mnc-devJason Monk2015-06-181-3/+0
|\ \ \
| * | | Remove battery history graph from details screenJason Monk2015-06-181-3/+0
| | |/ | |/| | | | | | | | | | Bug: 21854416 Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
* | | Allow give/take in app version/disabled fieldsJason Monk2015-06-181-2/+2
|/ / | | | | | | | | | | | | | | Switch to wrap_content so if one view is smaller, the other can use its space. Bug: 21901206 Change-Id: Ic69d2577c3291e6ed171caa0fa361ccc43eaf180
* | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-17154-8953/+4297
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2015-06-17154-8953/+4297
| | | | | | | | | | | | | | | Change-Id: I1ec85dbe877d7fae6edf1f93ec812bc7b1223daa Auto-generated-cl: translation import
* | | RIP -night DO NOT MERGEJason Monk2015-06-171-6/+0
|/ / | | | | | | | | Bug: 21854466 Change-Id: Ied1512cb1d8c80df9f6c990f8f91f82d7f140533
* | Merge "Actually gracefully finish this time around." into mnc-devJeff Sharkey2015-06-172-1/+22
|\ \
| * | Actually gracefully finish this time around.Jeff Sharkey2015-06-162-1/+22
| | | | | | | | | | | | | | | | | | | | | Also fix tinting on front-door icon. Bug: 21403958 Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
* | | 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-1626-18/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Remove theme setting DO NOT MERGE" into mnc-devJason Monk2015-06-161-7/+0
|\ \ \ \
| * | | | Remove theme setting DO NOT MERGEJason Monk2015-06-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it's just too incredibly useful... Bug: 21854466 Change-Id: I984cf709f484a220e9ba7738a8b9c166c28573b2
* | | | | Merge "Update for shortcuts" into mnc-devJason Monk2015-06-163-0/+4
|\ \ \ \ \
| * | | | | Update for shortcutsJason Monk2015-06-163-0/+4
| |/ / / / | | | | | | | | | | | | | | | Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
* | | | | Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-devSanket Padawe2015-06-163-12/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add PBAP checkbox for BT pairing consent dialog.Sanket Padawe2015-06-123-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20488109 Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
* | | | | 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