summaryrefslogtreecommitdiffstats
path: root/res/layout
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Adjust enrollment UI for sw400 devices" into mnc-devJorim Jaggi2015-07-284-11/+18
|\ \
| * | Adjust enrollment UI for sw400 devicesJorim Jaggi2015-07-274-11/+18
| |/ | | | | | | | | Bug: 22511825 Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
* | Merge "Autocapitalizing the fingerprint names now" into mnc-devSelim Cinek2015-07-271-1/+2
|\ \
| * | Autocapitalizing the fingerprint names nowSelim Cinek2015-07-241-1/+2
| | | | | | | | | | | | | | | Bug: 22412062 Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86
* | | Merge "Added content description for the fingerprint icon" into mnc-devSelim Cinek2015-07-271-0/+1
|\ \ \ | |/ /
| * | Added content description for the fingerprint iconSelim Cinek2015-07-241-0/+1
| |/ | | | | | | | | Bug: 22616421 Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804
* | Update battery optimization stringsJason Monk2015-07-271-2/+2
|/ | | | | Bug: 22687961 Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
* [ScreenLock] Style encryption interstitial in SUWMaurice Lam2015-07-201-0/+63
| | | | | | | | | When running in setup wizard, style the encryption interstitial using styles from Setup Wizard library, to be consistent with the rest of the setup flow. Bug: 22587892 Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
* Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-devMaurice Lam2015-07-211-1/+1
|\
| * [ScreenLock] Change title for RedactionInterstitialMaurice Lam2015-07-201-1/+1
| | | | | | | | | | | | | | Change the title for RedactionInterstital to "Notifications". Bug: 22587892 Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
* | Fix ugly text wrapping on non-english localesMakoto Onuki2015-07-161-0/+3
|/ | | | | | Bug 22284618 Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
* Merge "Use common xml file for multi-tab settings." into mnc-devSanket Padawe2015-07-161-60/+0
|\
| * Use common xml file for multi-tab settings.Sanket Padawe2015-07-141-60/+0
| | | | | | | | | | Bug: 22360525 Change-Id: Id4d971e0afcd9ecd43005a0a5056ad03a32b704f
* | Merge "Disable ignore battery optimization items that can't change" into mnc-devJason Monk2015-07-152-6/+12
|\ \
| * | Disable ignore battery optimization items that can't changeJason Monk2015-07-152-6/+12
| | | | | | | | | | | | | | | Bug: 22507803 Change-Id: Ia33746dc569f4d9f96242a502e54bcc8eb47bf12
* | | Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-devMaurice Lam2015-07-155-5/+6
|\ \ \
| * | | [Fingerprint] Add fingerprint enroll in setup wizardMaurice Lam2015-07-155-5/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a subclass for each enrolling screen that setup wizard uses, and in override the corresponding get*Intent methods to always use the setup wizard versions of the next screens. On minor change made to the original flow is that it will now return RESULT_OK if it is finished, as opposed to RESULT_CANCELED. Bug: 21695577 Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
* | | Fixed the layout for the fingerprint renamingSelim Cinek2015-07-151-4/+11
|/ / | | | | | | | | | | Bug: 21957061 Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c (cherry picked from commit abd67de1ad3f265f217491b0e8b21819cfdcdcbe)
* | Merge "Fix up Tap and Pay how it works." into mnc-devMartijn Coenen2015-07-142-8/+8
|\ \
| * | Fix up Tap and Pay how it works.Martijn Coenen2015-07-102-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also, don't use HCE service description. Bug: 21988684 Bug: 21657963 Change-Id: I2facb30b80da5452ef14592c937e2db850c33835
* | | Fix app icon sizeJason Monk2015-07-131-2/+2
| |/ |/| | | | | | | Bug: 22425103 Change-Id: I35b3476eb75d221e5f244702534d4475b2c5921e
* | Merge "Remove unused MediaFormat activity" into mnc-devRubin Xu2015-07-102-77/+0
|\ \
| * | Remove unused MediaFormat activityRubin Xu2015-07-092-77/+0
| | | | | | | | | | | | | | | | | | | | | As part of cleanup of ExternalStorageFormatter. Bug: 9433509 Change-Id: I4d2bca544e00a549d8c136713da59d07648b9ffe
* | | Merge "Talkback improvements for Settings screens." into mnc-devJulia Reynolds2015-07-092-1/+3
|\ \ \ | |/ / |/| |
| * | Talkback improvements for Settings screens.Julia Reynolds2015-07-092-1/+3
| | | | | | | | | | | | | | | Bug: 21164141 Change-Id: I7444261ccf967f6db70c9fe44a00bd3f19ceb975
* | | Merge "Locale based string changes in BT." into mnc-devSanket Padawe2015-07-081-0/+1
|\ \ \ | |/ / |/| |
| * | Locale based string changes in BT.Sanket Padawe2015-07-071-0/+1
| | | | | | | | | | | | | | | Bug: 22219203 Change-Id: Ic920621baf769032475da32ea425097aafa0922e
* | | Fix some ordering, colors, and accessibility bugs.Jeff Sharkey2015-07-052-2/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | When adding preferences to public/private details screens, always add in-order when rebuilding. Hacky fix for broken summary text and eject image color tints. Fix crash when device rotated during partitioning. Set correct accessibility titles in all wizard steps. Bug: 22098044, 21376962 Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7
* | Remove char limit from owner infoJason Monk2015-06-291-9/+0
|/ | | | | Bug: 21959734 Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1
* Merge "Update storage wizard's assets." into mnc-devDaichi Hirono2015-06-255-5/+5
|\
| * Update storage wizard's assets.Daichi Hirono2015-06-255-5/+5
| | | | | | | | | | | | BUG=22049781 Change-Id: Ie7eae9c76db06c77d0f4e85941125c005c2f28eb
* | Merge "Fix marquee on app snippet in InstalledAppDetails" into mnc-devJason Monk2015-06-241-8/+15
|\ \ | |/ |/|
| * Fix marquee on app snippet in InstalledAppDetailsJason Monk2015-06-241-8/+15
| | | | | | | | | | | | | | | | | | | | First need to fix layout of the app_item as the widget was running over the end of the view, do this by switching to a RelativeLayout. Then select the view so it can actually marquee. Bug: 22043942 Change-Id: Ieb94649ccf3dc8dcf56014c02fcdc06da71a9a62
* | Merge "Change the color of format button in "Device storage > Format" ↵Daichi Hirono2015-06-241-1/+3
|\ \ | | | | | | | | | screen." into mnc-dev
| * | Change the color of format button in "Device storage > Format" screen.Daichi Hirono2015-06-241-1/+3
| | | | | | | | | | | | | | | | | | BUG=21898857 Change-Id: Ic1619482f5294b6f2d1e14154bab25103ec3b630
* | | Merge "Added contentDescription for fingerprint on the confirmCredential ↵Selim Cinek2015-06-232-0/+2
|\ \ \ | |_|/ |/| | | | | screen" into mnc-dev
| * | Added contentDescription for fingerprint on the confirmCredential screenSelim Cinek2015-06-232-0/+2
| | | | | | | | | | | | | | | Bug: 21850269 Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
* | | Merge "Align Enlish words to RTL in RTL context in networkreset Settings." ↵Sanket Padawe2015-06-231-0/+1
|\ \ \ | |/ / |/| | | | | into mnc-dev
| * | Align Enlish words to RTL in RTL context in networkreset Settings.Sanket Padawe2015-06-221-0/+1
| | | | | | | | | | | | | | | Bug: 21553326 Change-Id: I216723172cc6998e1432d0a066f21a72afe1bc27
* | | 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-221-1/+2
|/ / | | | | | | | | | | | | Also enables scroll indicators in color grid dialog. Bug: 21602597 Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
* | 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
* | 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
* Finish storage wizard theming.Jeff Sharkey2015-06-168-18/+59
| | | | | | | | | | | | 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/+1
|\
| * Update for shortcutsJason Monk2015-06-161-0/+1
| | | | | | | | Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e