summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Update string description to be more clear.Jason Monk2015-03-311-1/+1
| | | | | Bug: 20000920 Change-Id: I393591ecdedb5dc87b4adb9b2e0a684738bcccee
* Add permissions screen to advanced appsJason Monk2015-03-302-0/+15
| | | | | | | | | Add a screen that shows a list of permissions and how many apps have been granted them, link to PackageInstaller for control of the permissions. Depends on I68cdbe53177f742daf396f4eb53761fd5cda2636 Change-Id: I183848ea89ea41a17eaf663441dc4ef963be99bf
* Import translations. DO NOT MERGEGeoff Mendal2015-03-307-20/+15
| | | | | Change-Id: I27d243fa4d6ef7c0cb916a242d595cf48bf5e11d Auto-generated-cl: translation import
* Merge "Fix switch bar theme, clean up text appearances"Alan Viverette2015-03-272-27/+12
|\
| * Fix switch bar theme, clean up text appearancesAlan Viverette2015-03-272-27/+12
| | | | | | | | Change-Id: Ica2577ecfce61270bc38ea4a22d37f7e37f0b1bc
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-2774-1242/+988
|/ | | | | Change-Id: Ic235d2ba6215cbcf6850d8e7fab2a405311b7d32 Auto-generated-cl: translation import
* Merge "Merge remote-tracking branch ↵Prerepa Viswanadham2015-03-253-16/+37
|\ | | | | | | 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java"
| * Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into ↵Prerepa Viswanadham2015-03-243-16/+37
| |\ | | | | | | | | | | | | | | | | | | | | | master_merge Fix build in DevelopmentSettings.java Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
| | * Remove WFC roaming from search keywordsPavel Zhamaitsiak2015-03-191-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 71a6922 * commit '71a692225efed6ac3b318441bc31e637204561f6': Remove WFC roaming from search keywords
| | | * Remove WFC roaming from search keywordsPavel Zhamaitsiak2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19682545 Change-Id: I8606d75a70d2ad3fb646472f8baddbe12e5bac21
| | * | Remove WFC Roaming settingPavel Zhamaitsiak2015-03-182-9/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | automerge: 1e034fe * commit '1e034fe79a164a12385b077e2aad9ebfaab5e389': Remove WFC Roaming setting
| | | * Remove WFC Roaming settingPavel Zhamaitsiak2015-03-122-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug 19682545 Change-Id: I0adc7a20c411dd1fea3e2b79bcd5e159537a65c0
| | * | Add a developer settings checkbox to use the legacy DHCP client.Lorenzo Colitti2015-03-172-17/+37
| | | | | | | | | | | | | | | | Change-Id: I18471bdf137fbb128d7e4ae6b9b1a4675f5e7fbc
* | | | Merge "Update Settings to use new fingerprint API"Jim Miller2015-03-251-17/+2
|\ \ \ \
| * | | | Update Settings to use new fingerprint APIJim Miller2015-03-241-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 16487912 Change-Id: I99ac78f476d43f6b87f5dd20e597c51ed08d2c0e
* | | | | Merge "Allow system apps to add to settings dashboard"Jason Monk2015-03-255-1/+18
|\ \ \ \ \
| * | | | | Allow system apps to add to settings dashboardJason Monk2015-03-255-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow system apps to add a tile to the top level of settings that links to an activity through adding a filter for a specific action. Determine the info for the tile based off manifest info for the activity. Also allow the same for managed profiles, but show a dialog in between to select which profile. The category in which the item is to be placed must be in meta-data. The icon and title can be specified through meta-data as well or if unspecified the activity's label and icon will be used. Also added an optional <external-tiles> tag to the dashboard category xml, this allows Settings to put external tiles in the middle of some categories (Personal does this). Bug: 19443117 Change-Id: Idc9938d1549d181103a3030a8784b527215a8399
* | | | | | Merge "Add running services screen to developer options"Jason Monk2015-03-251-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add running services screen to developer optionsJason Monk2015-03-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This used to live under manage apps, but does no longer. Bug: 19926589 Change-Id: I2554f14205286cc38fc87779873c37a5a1f80c4e
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2574-2795/+2521
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c6e884fd6411845209ce454d98fdb653a1d6158 Auto-generated-cl: translation import
* | | | | | Merge "Added a screen to configure wireless scanning"Lifu Tang2015-03-243-12/+49
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added a screen to configure wireless scanningLifu Tang2015-03-233-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Created "Scanning" preference screen - Added overflow menu on "Location" settings to access "Scanning" settings - Moved "Wi-Fi scanning always available" from Wi-Fi settings to "Scanning" settings - Added "Bluetooth scanning always available" preference (UI only) Change-Id: I85d8cd60ab309db5db9caee43f4b5a117192d904
* | | | | | Merge "Fix type-o in fingerprint dialog text"Jim Miller2015-03-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix type-o in fingerprint dialog textJim Miller2015-03-231-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes bug 19890194 Change-Id: Id24f3baf6a0105348f4f0e205977191d72bfe132
* | | | | Make notifications app list use new manage appsJason Monk2015-03-233-44/+11
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The designs for Settings have the notification app list using the same UI as the Manage Apps list, so switch the notification app list over to the ManageApplications fragment. This involves adding some notification based filters and connecting the data from the Notification Backend to ApplicationsState. Bug: 19443900 Change-Id: I5e5cdb16890d536613ee59292b89a89b6fb9e2e6
* | | | Merge "Implement new Manage Apps list"Jason Monk2015-03-237-47/+179
|\ \ \ \
| * | | | Implement new Manage Apps listJason Monk2015-03-237-47/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manage apps now only has one list. When entered from the dashboard it is not sortable or filterable, and shows a combination of downloaded apps and anything that shows up in launcher. When 'all apps' is entered through advanced app settings, the list shows all apps and can be filtered and sorted. Bug: 19443900 Change-Id: I555ee56417c330424d458750b6f81d3bd543f66d
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2347-825/+414
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ic9bff064e76901057d2255ace54f727b24e01030 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-2175-2302/+6483
| | | | | | | | | | | | | | | | | | | | Change-Id: I98b7918077e100eb54eaeb121e53ed9b60b624d5 Auto-generated-cl: translation import
* | | | Merge "Settings: App notification settings updates."John Spurlock2015-03-202-7/+22
|\ \ \ \
| * | | | Settings: App notification settings updates.John Spurlock2015-03-202-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tweak language. - Add new heads-up configuration setting. - Remove instead of disable settings dependent on the banhammer. Bug: 19776495 Change-Id: I3fac1a61bd66acd6db70b461e414c4e55dee9296
* | | | | Merge "Clean up usage of theme colors, deprecated Resources.getColor* methods"Alan Viverette2015-03-204-10/+40
|\ \ \ \ \
| * | | | | Clean up usage of theme colors, deprecated Resources.getColor* methodsAlan Viverette2015-03-184-10/+40
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I34e11e0773c9f8e00e3eab422781094e19a16d3d
* | | | | String fixes for Settings.PauloftheWest2015-03-202-2/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | Bug: 18359513 Bug: 17659522 Change-Id: I4645c1e615661613c22b86981ede34327da51aab
* | | | Start implementation of new app info storage pageJason Monk2015-03-1912-318/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Things are mostly in the right places, may need some minor location adjustment on everything and styling for the buttons. Bug: 19511439 Change-Id: If7730285d6ddc36e32cc8bc119885a8e215c0eb5
* | | | Merge "Only show 2 buttons in app info screen"Jason Monk2015-03-191-5/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Only show 2 buttons in app info screenJason Monk2015-03-181-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are disable or uninstall and force stop. When there is a third action it gets pushed to the overflow menu. Bug: 19511439 Change-Id: I1a0ee71662c09f191fd15524f1a123877eabbe90
* | | | Merge "Add option to reset network settings to factory"Stuart Scott2015-03-184-57/+158
|\ \ \ \
| * | | | Add option to reset network settings to factoryStuart Scott2015-03-094-57/+158
| | | | | | | | | | | | | | | | | | | | | | | | | bug:16161518 Change-Id: I7c0cc58d5385352c6c9af2b27af23a744b5df977
* | | | | Merge "Add data item to app info screen"Jason Monk2015-03-183-12/+21
|\ \ \ \ \
| * | | | | Add data item to app info screenJason Monk2015-03-183-12/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link from app info to directly viewing data usage for that app. Also do some minor tweaks to get ordering and summaries right on the app info screen. Bug: 19511439 Change-Id: Ic50dc24bf9a5c1fe6a7aa076772915ba61168fac
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-1873-1054/+946
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ad128a937bfdcee9af796b930c5f316ecbb9154 Auto-generated-cl: translation import
* | | | | Settings: Add a 'Cast' entry point under Sound & notification.John Spurlock2015-03-172-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19779557 Change-Id: I2d2a9e366eabfbc17f706813c9018275746d89b7
* | | | | Settings: 'Cast screen' -> 'Cast'.John Spurlock2015-03-171-1/+1
|/ / / / | | | | | | | | | | | | | | | | Bug: 19773357 Change-Id: Ie222166e4d7a0bd27ea2f34ac6a7e6ba759edd7e
* | | | Merge "Merge profiles apps into app list"Jason Monk2015-03-161-5/+0
|\ \ \ \
| * | | | Merge profiles apps into app listJason Monk2015-03-161-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the spinner and add all apps into one list and badge the managed items. Bug: 19443900 Change-Id: I9ccacc1b503da2663b9a3945f4fd6051ae95e328
* | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-1674-729/+4111
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a5e2c22d16914aaaed29701a8a84efbf3dfe9e1 Auto-generated-cl: translation import
* | | | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-169-37/+139
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
| * | | | am "set softAP on a specified band, including both 2.4 and 5 GHz band"Vinit Deshpande2015-03-062-0/+31
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | merged from partner/m-wireless-wifi-dev 82ff3d5 set softAP on a specified band, including both 2.4 and 5 GHz band
| | * | | set softAP on a specified band, including both 2.4 and 5 GHz bandxinhe2015-01-162-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:18929692 Change-Id: I455e9b17e5091596beb0246ccfd981c5d2b932f0