summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-05-11146-27359/+16896
| | | | | Change-Id: I57e694a0f716f9c8a45493cd1b4a2ad9d6d4a7ef Auto-generated-cl: translation import
* Merge "Settings: New DND access settings page." into mnc-devJohn Spurlock2015-05-082-1/+23
|\
| * Settings: New DND access settings page.John Spurlock2015-05-082-1/+23
| | | | | | | | | | | | | | | | | | | | - New advanced notification settings subpage for managing apps that have requested the ability to manage notification policy. - Create new "Advanced" section at the bottom of notification settings for this and the existing Notification access settings page. Bug: 18298798 Change-Id: Ib415e634980d37d6492799f67a6619700ee2a01c
* | Merge "Button that goes from app info details to app info" into mnc-devJason Monk2015-05-084-1/+35
|\ \ | |/ |/|
| * Button that goes from app info details to app infoJason Monk2015-05-084-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This info button is shown on the header of all app detail pages. This button is hidden when coming from app info, to avoid allowing users to go in circles. Since app notification details had a settings button where the new info button goes, the app notification settings will move down to be a preference (this matches the usage access screen UX). Also fix a bug in launching app notification settings for managed profiles. Bug: 20633669 Change-Id: Idbb4f7c3326b4c6b0a19559b722ee0406eaba6c0
* | Merge "Add settings for persisting the mobile data connection." into mnc-devErik Kline2015-05-082-1/+9
|\ \
| * | Add settings for persisting the mobile data connection.Erik Kline2015-05-012-1/+9
| | | | | | | | | | | | Change-Id: I9b92104893e860e2beb63ac86d417419699c085b
* | | Avoid SElinux denial accessing IMEI informationRaju Yadav2015-05-071-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set persistent attribute to false so preferences are not stored in shared preferences, this avoids the SElinux denial: W/SharedPreferenc( 6950): type=1400 audit(0.0:4): avc: \ denied { search } for name="com.android.settings" \ dev="mmcblk0p25" ino=48929 scontext=u:r:radio:s0 \ tcontext=u:object_r:system_app_data_file:s0 tclass=dir\ op_res=-13 ppid=319 pcomm="main" tgid=1589\ tgcomm="m.android.phone" Observed when entering IMEI information in: Settings > About Phone > Status > IMEI information. It makes no sense to store this information in shared preferences anyway so no functinoality is lost with this change. (cherrypicked from commit b2ad5bb522e378a7ef63e5e9f6329217d8f2f0c2) Change-Id: Id778bbadc8141167d679177b39e1d7a540d5752c
* | | Merge "Updates/fixes to memory settings" into mnc-devJason Monk2015-05-073-12/+18
|\ \ \
| * | | Updates/fixes to memory settingsJason Monk2015-05-073-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update memory states to be Good performance, Ok performance, etc. - Update header info to be based on history rather than instantaneous - Color memory bar differently based on state - Fix run frequency bucketing to be correct - Show dialog for selecting duration, and fix duration selection - Update process naming to: - If process name is "anything:xxxx" then show "Xxxx" - If process name is "com.app.package.interface" then show "Interface" - If process name is the package name then show the app name - Otherwise fallback to the process name string Bug: 20694769 Change-Id: Ic1fab28bfd2422bde84dd10bd305a4cc34be98cf
* | | | Merge "Use theme colors in battery stats widget" into mnc-devAlan Viverette2015-05-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use theme colors in battery stats widgetAlan Viverette2015-05-061-1/+1
| |/ / | | | | | | | | | | | | Bug: 20633519 Change-Id: Ia83848ff506afbddf320fa0ed3d022f9a0e884dc
* | | Merge "Fix app headers in settings" into mnc-devJason Monk2015-05-072-0/+10
|\ \ \
| * | | Fix app headers in settingsJason Monk2015-05-062-0/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Use SettingsPreferenceFragment's method for pinned headers where possible, and add a frame within the fragment for them to live in otherwise so that this view doesn't end up on the activity. Bug: 20886475 Change-Id: I985eb1497744ea50bfabed862e5088eb89df5b61
* / / Settings: Add setting to mute wireless charging sound.John Spurlock2015-05-062-0/+11
|/ / | | | | | | | | Bug: 19538553 Change-Id: I93228aee38f8eb035025409ce063f3050bf9bb9a
* | Settings: Migrate calls & messages priority settings.John Spurlock2015-05-052-22/+12
| | | | | | | | | | Bug: 18635172 Change-Id: Ib5fe3bc80590875bb4a1547013ac3444939ab6fd
* | Settings UI for SIM access profile (1/2)Casper Bonde2015-05-051-0/+6
| | | | | | | | Change-Id: Iff14295ac0eb65561a2097f25c70e8b5f8be5003
* | Removed some dead Face Unlock code.Brian Colonna2015-05-052-29/+0
| | | | | | | | | | | | | | | | | | I checked to see if any dead Face Unlock code remains in settings. Most of it has been removed, but I did find some strings and an xml file that can be removed. Bug: 16139545 Change-Id: I16d7b3a258c72d6788348d1fbe35a7f6bc12ee8e
* | Merge "Settings: Calendar event zen rule string updates." into mnc-devJohn Spurlock2015-05-052-39/+18
|\ \
| * | Settings: Calendar event zen rule string updates.John Spurlock2015-05-052-39/+18
| | | | | | | | | | | | | | | | | | | | | | | | - Remove Attendance option. - Use new reply value, tweak wording and summaries. Bug: 20064962 Change-Id: I6977b494e54752fa87ea08df0ed085129a09a3d3
* | | Merge "Rename default dialer to default phone app" into mnc-devYorke Lee2015-05-052-8/+8
|\ \ \ | |/ / |/| |
| * | Rename default dialer to default phone appYorke Lee2015-04-302-8/+8
| | | | | | | | | | | | Change-Id: Ib6c147ba132ed5296de5e932e5dc378183ef92a3
* | | Merge "Add high power whitelist for apps" into mnc-devJason Monk2015-05-0412-295/+162
|\ \ \
| * | | Add high power whitelist for appsJason Monk2015-05-0412-295/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Strings not final! - New UX for power usage details (more preferency) - Add high power apps list shows on/off and screen to change (when possible) - Link from power usage summary to high power list - Link from advanced apps to high power list Bug: 19991702 Change-Id: I97c927ed82d3b89041e4429b427508545763d66c
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-05-04146-15164/+28151
|/ / / | | | | | | | | | | | | Change-Id: I9fa131ac5fdd9b014c319fa72ede5aaca13eb24c Auto-generated-cl: translation import
* | | Use curly quotes and apostrophesMaurice Lam2015-05-011-157/+157
| | | | | | | | | | | | | | | | | | | | | | | | Per UX writing style guide, quotes and apostrophes should be curly https://spec.googleplex.com/live/style/writing.html#writing-global-writing Bug: 20706978 Change-Id: Idcbb9014c7c04f6f8336a58d2ff5a0ea9409110a
* | | Merge "ApnEditor changes to support bearer as a bitmask." into mnc-devAmit Mahajan2015-05-012-5/+44
|\ \ \
| * | | ApnEditor changes to support bearer as a bitmask.Amit Mahajan2015-04-302-5/+44
| | | | | | | | | | | | | | | | Change-Id: I8d97f7e789a6ab75f2c5931624fe9694589fc215
* | | | Add MDM app name under "Work" in Accounts section of Settings.Sudheer Shanka2015-05-011-0/+40
|/ / / | | | | | | | | | | | | Bug: 20024761 Change-Id: I3fe3fd6be8a2d96b36c402ea9bde8cc782797262
* | | Merge "Update fingerprint settings to spec" into mnc-devJorim Jaggi2015-04-304-23/+62
|\ \ \
| * | | Update fingerprint settings to specJorim Jaggi2015-04-304-23/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make it look like a sub settings activity, with back button - Add disclaimer to describe what your fingerprint can be used for - Update visuals and text for "Add fingerprint" - Update related string Bug: 20594955 Change-Id: I0adfcc743db386e0abf9cfdafff3d068ebc3b4bc
* | | | Merge "Increase clip debug string limit" into mnc-devChris Craik2015-04-301-1/+1
|\ \ \ \
| * | | | Increase clip debug string limitChris Craik2015-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:19189024 Change-Id: I6c9969032d852c6724ceb977705169ec5b8d2a5b
* | | | | [WifiSetup] Use bullets in skip dialogMaurice Lam2015-04-301-3/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Use BulletSpan (<li>) to show bullets in the dialog when the user skips Wi-Fi in setup wizard. Bug: 20706978 Change-Id: If81bdfad39dd9ffff7543cf531db40d813b57ec8
* | | | Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-devMaurice Lam2015-04-304-139/+0
|\ \ \ \
| * | | | [WifiSettings] Align text in Wi-Fi dialogMaurice Lam2015-04-294-139/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The themes for Wi-Fi dialog in sw600dp is outdated and causing the labels and text fields to be misaligned. This CL removes all the related styles except for the one in value/styles.xml, so that all screens use the same styles (the items and values in the styles were all the same except for sw600dp which this CL fixes). Bug: 20663443 Change-Id: I59a079c1a4cc1ae3e99d863cb24816e609e98109
* | | | | Merge "[WifiSetup] Show MAC address in footer" into mnc-devMaurice Lam2015-04-301-0/+38
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [WifiSetup] Show MAC address in footerMaurice Lam2015-04-301-0/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Show the MAC address in footer so that advanced users can configure their router whitelist etc. Bug: 6939795 Change-Id: I858d21fb68f67f74e5b7e3a1960ea4d7966acb29
* | | | Merge "[WifiSettings] Add progress bar when scanning" into mnc-devMaurice Lam2015-04-305-1/+110
|\ \ \ \ | |_|_|/ |/| | |
| * | | [WifiSettings] Add progress bar when scanningMaurice Lam2015-04-295-1/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a progress bar when the Wi-Fi screen is in a transient state, like enabling, disabling Wi-Fi and scanning for network. This change sets the progress bar as a pinned header at the top of the activity. The pinned header container needs to be match parent so that the progress bar can occupy the full width of the screen. If the header view doesn't want to fill the width, then the header view *inside* the container should be wrap_content. Added an overloaded setPinnedHeader method that takes a layout resource ID, and returns the view to the caller. This way the inflater can set the parent property so that layout params will not be ignored. Bug: 17389577 Change-Id: I18d0eb7c72ad31d1c4b35a54789016c32c81fb93
* | | | Merge "Add MDM app label string." into mnc-devSudheer Shanka2015-04-301-0/+2
|\ \ \ \
| * | | | Add MDM app label string.Sudheer Shanka2015-04-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20024761 Change-Id: I05480d36a99864653ba2eceb3561b5da242898e6
* | | | | Merge "Settings: Do not disturb automatic rule updates." into mnc-devJohn Spurlock2015-04-307-6/+217
|\ \ \ \ \
| * | | | | Settings: Do not disturb automatic rule updates.John Spurlock2015-04-307-6/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove FAB for adding rules, move to last preference. - Add first-class event condition type and config sub-page. - Always show radio buttons when adding rules. - Add new data model for event rules. - Add stub condition provider for event rules (always false for now). - Add rule-type icons to rule preference rows. Bug: 20064962 Change-Id: Id5acde371eb2e7d22b1f195459897614db5ba80a
* | | | | | Merge "Handle no peeking in app info pages" into mnc-devJason Monk2015-04-302-5/+14
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Handle no peeking in app info pagesJason Monk2015-04-302-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20496400 Change-Id: Icdcb997f35497c7664af948ad7ada722835e42b4
* | | | | | Returning to wizard, enable migration.Jeff Sharkey2015-04-292-3/+8
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring primary storage migration back into the adoption flow, and provide a path for long-lived notifications to re-launch into the Settings app. Also provide option to initiate migration if skipped during wizard. For now, estmiate migration size and time based on a Class 10 card. Follow other callback refactoring. Bug: 19993667 Change-Id: Ia0c28eb114bc6c8066c17b3142ed74f962140c91
* | | | | Merge "[WifiSetup] Use default theme for Wi-Fi dialogs" into mnc-devMaurice Lam2015-04-291-18/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [WifiSetup] Use default theme for Wi-Fi dialogsMaurice Lam2015-04-281-18/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just use the default theme as the dialog doesn't require any additional attributes to be specified. (Theme.Settings is setting alertDialogTheme to Theme.AlertDialog as well). This will allow the correct accent colors (among other theme attributes) to be propagated to the dialog. Bug: 20663720 Change-Id: Ibb12c185e8104ccb8f3ddd01524127c748b47487
* | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-04-2973-2558/+3786
|\ \ \ \ | |_|/ / |/| | |