summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of c10abb25f3 to cw-e-dev.Svetoslav2015-11-2017-111/+141
* Make GrantPermissions dialog not swipable on WatchAnthony Hugh2015-10-271-0/+1
* Import translations. DO NOT MERGEGeoff Mendal2015-10-2678-313/+339
* Import translations. DO NOT MERGEGeoff Mendal2015-10-2197-39/+177
* Import translations. DO NOT MERGEGeoff Mendal2015-10-21156-434/+3296
* Reduce the top padding when message isn't at top.Danny Epstein2015-10-203-14/+25
* Add top padding to grant permission content.Danny Epstein2015-10-193-1/+4
* Modifies wear Permission title height to avoid clippingAlex Hills2015-10-131-1/+2
* Permissions redline fixesAnthony Hugh2015-10-059-10/+82
* Merge "Block Install Intent for Wear devices" into cw-e-devVinod Krishnan2015-10-012-0/+7
|\
| * Block Install Intent for Wear devicesVinod Krishnan2015-09-282-0/+7
* | Merge "Add enabled/disabled icons for permissions on Wear" into cw-e-devAnthony Hugh2015-09-2585-1/+2
|\ \
| * | Add enabled/disabled icons for permissions on WearAnthony Hugh2015-09-2385-1/+2
* | | Fix CTS test by renaming button ids to matchAnthony Hugh2015-09-241-3/+3
|/ /
* | Merge "Add new dialog for warning confirmations" into cw-e-devAnthony Hugh2015-09-232-1/+1
|\ \ | |/ |/|
| * Add new dialog for warning confirmationsAnthony Hugh2015-09-232-1/+1
* | MNC Perms: Button bar animate to max half window heightVinod Krishnan2015-09-221-1/+1
|/
* Update Grant Permissions dialog to redlinesAnthony Hugh2015-09-2212-20/+28
* Permissions Settings UI updatesAnthony Hugh2015-09-172-3/+6
* Add string for Wear version of permission "enforced by policy"Anthony Hugh2015-09-161-0/+3
* Build initial Permissions Settings UI page for WearAnthony Hugh2015-09-151-0/+45
* Merge "Permissions Watch settings UI port" into cw-e-devAnthony Hugh2015-09-168-0/+186
|\
| * Permissions Watch settings UI portAnthony Hugh2015-09-158-0/+186
* | Changing layout to make button animations workVinod Krishnan2015-09-145-65/+94
|/
* Implement base version of GrantPermissions dialogAnthony Hugh2015-08-2117-0/+330
* Revert "Implement base version of GrantPermissions dialog"Anthony Hugh2015-08-2117-311/+0
* Implement base version of GrantPermissions dialogAnthony Hugh2015-08-2117-0/+311
* am 14595d69: am 0c5d3ddf: Merge "Show warning when touches are being blocked ...Jason Monk2015-08-075-7/+5
|\
| * am 0c5d3ddf: Merge "Show warning when touches are being blocked by overlays" ...Jason Monk2015-08-075-7/+5
| |\
| | * Merge "Show warning when touches are being blocked by overlays" into mnc-devJason Monk2015-08-075-7/+5
| | |\
| | | * Show warning when touches are being blocked by overlaysJason Monk2015-08-075-7/+5
* | | | am 60115205: am 51fc8c6e: Merge "Fix string %d insertions" into mnc-devJason Monk2015-08-071-1/+1
|\| | |
| * | | am 51fc8c6e: Merge "Fix string %d insertions" into mnc-devJason Monk2015-08-071-1/+1
| |\| |
| | * | Merge "Fix string %d insertions" into mnc-devJason Monk2015-08-071-1/+1
| | |\ \
| | | * | Fix string %d insertionsJason Monk2015-08-071-1/+1
| | | |/
| | * / Import translations. DO NOT MERGEGeoff Mendal2015-08-0778-83/+239
| | |/
| * / Import translations. DO NOT MERGEGeoff Mendal2015-08-0578-80/+419
| |/
* | am 8432af0c: am cea90ebd: Add strings for the screen overlay warningSvetoslav2015-08-051-5/+12
|\|
| * Add strings for the screen overlay warningSvetoslav2015-08-041-5/+12
| * Import translations. DO NOT MERGEGeoff Mendal2015-08-0380-194/+241
* | am 53481e2c: am 7741e471: Merge "Add string for screen overlay warning." into...Jason Monk2015-07-291-0/+6
|\ \
| * | am 7741e471: Merge "Add string for screen overlay warning." into mnc-devJason Monk2015-07-291-0/+6
| |\|
| | * Merge "Add string for screen overlay warning." into mnc-devJason Monk2015-07-291-0/+6
| | |\
| | | * Add string for screen overlay warning.Jason Monk2015-07-291-0/+6
* | | | am ab353094: am 3c8b44e3: Remove old -night values DO NOT MERGEJason Monk2015-07-291-21/+0
|\| | |
| * | | am 3c8b44e3: Remove old -night values DO NOT MERGEJason Monk2015-07-291-21/+0
| |\| |
| | * | Remove old -night values DO NOT MERGEJason Monk2015-07-291-21/+0
| | |/
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-223-1/+142
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-2078-157/+3
| |/
* | am 50c7b52d: am 4bb2c78d: Merge "Remove the obsolete \'show legacy\' option f...Svet Ganov2015-07-172-30/+0
|\|