summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-06-13112-5344/+4665
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-13112-5344/+4665
* | Merge "Show time to go while encrypting drive"Paul Lawrence2014-06-121-0/+4
|\ \
| * | Show time to go while encrypting drivePaul Lawrence2014-06-051-0/+4
* | | resolved conflicts for merge of c2c64a31 to masterMark Salyzyn2014-06-133-0/+38
|\ \ \
| * \ \ am 5a9a18c1: Merge "logd: Add Developer settings for size"Mark Salyzyn2014-06-133-0/+39
| |\ \ \
| | * | | logd: Add Developer settings for sizeMark Salyzyn2014-06-133-0/+39
| | * | | am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog textDavid Braun2014-03-141-1/+1
| | |\ \ \
| | * \ \ \ am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text...Alan Viverette2014-03-112-0/+6
| | |\ \ \ \
| | * \ \ \ \ am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captio...Alan Viverette2014-03-113-4/+3
| | |\ \ \ \ \
| | * \ \ \ \ \ am a8e634ca: am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display me...Wei Wang2014-03-081-1/+1
| | |\ \ \ \ \ \
| * | | | | | | | DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertis...Wei Wang2014-03-193-93/+14
* | | | | | | | | Fix padding issue with Dream list itemFabrice Di Meglio2014-06-131-1/+3
* | | | | | | | | Merge "Remove pin and add restrictions for Security settings."Julia Reynolds2014-06-123-1/+42
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Remove pin and add restrictions for Security settings.Julia Reynolds2014-06-133-1/+42
* | | | | | | | | am 8cd7dc23: Merge "Add Settings theme" into lmp-preview-devAlan Viverette2014-06-122-27/+5
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Add Settings theme" into lmp-preview-devAlan Viverette2014-06-112-27/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add Settings themeAlan Viverette2014-06-112-27/+5
* | | | | | | | | | | am deb08839: Merge "Fix bug #15384992 Setting Dashboard - padding updates" i...Fabrice Di Meglio2014-06-123-23/+30
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-previ...Fabrice Di Meglio2014-06-113-23/+30
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix bug #15384992 Setting Dashboard - padding updatesFabrice Di Meglio2014-06-113-23/+30
* | | | | | | | | | | | am 26ac83df: Merge "Settings: Remove master swtich from battery saver." into ...John Spurlock2014-06-122-1/+12
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge "Settings: Remove master swtich from battery saver." into lmp-preview-devJohn Spurlock2014-06-102-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Settings: Remove master swtich from battery saver.John Spurlock2014-06-112-1/+12
| | |/ / / / / / / / /
* | | | | | | | | | | am f5440793: Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to s...Fabrice Di Meglio2014-06-121-0/+4
|\| | | | | | | | | |
| * | | | | | | | | | Fix bug #15558357 java.lang.RuntimeException: Unable to start activityFabrice Di Meglio2014-06-111-0/+4
* | | | | | | | | | | am caf4b1dd: Fix bug #15543626 Bluetooth Settings headers need to support Qua...Fabrice Di Meglio2014-06-121-1/+2
|\| | | | | | | | | | | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix bug #15543626 Bluetooth Settings headers need to support Quantum stylingFabrice Di Meglio2014-06-111-1/+2
| |/ / / / / / / /
* | | | | | | | | Merge "Set quantum pattern for crypt dialogs"Paul Lawrence2014-06-111-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set quantum pattern for crypt dialogsPaul Lawrence2014-06-111-0/+7
* | | | | | | | | | am 782d0f68: Merge "Fix bug #15545573 Battery use chart is incorrect for date...Fabrice Di Meglio2014-06-121-10/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and t...Fabrice Di Meglio2014-06-101-10/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix bug #15545573 Battery use chart is incorrect for date labels and time axi...Fabrice Di Meglio2014-06-101-10/+0
* | | | | | | | | | am 1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview...Fabrice Di Meglio2014-06-116-15/+42
|\| | | | | | | | |
| * | | | | | | | | Merge "Update Settings redlines per UX request" into lmp-preview-devFabrice Di Meglio2014-06-106-15/+42
| |\| | | | | | | |
| | * | | | | | | | Update Settings redlines per UX requestFabrice Di Meglio2014-06-106-15/+42
* | | | | | | | | | am e9ee5e2c: Merge "Settings: Battery saver settings sub-page." into lmp-prev...John Spurlock2014-06-113-0/+58
|\| | | | | | | | |
| * | | | | | | | | Merge "Settings: Battery saver settings sub-page." into lmp-preview-devJohn Spurlock2014-06-103-0/+58
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Settings: Battery saver settings sub-page.John Spurlock2014-06-103-0/+58
| * | | | | | | | | | Remove obsolete NFC unlock XML file.Martijn Coenen2014-06-101-43/+0
* | | | | | | | | | | am a29f3bbf: Merge "Ripple tint is now color" into lmp-preview-devAlan Viverette2014-06-113-10/+5
|\| | | | | | | | | |
| * | | | | | | | | | Merge "Ripple tint is now color" into lmp-preview-devAlan Viverette2014-06-103-10/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Ripple tint is now colorAlan Viverette2014-06-103-10/+5
| * | | | | | | | | | | Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-devBaligh Uddin2014-06-10112-3957/+5286
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Breaks the build.Baligh Uddin2014-06-10112-3957/+5286
* | | | | | | | | | | | | am df055ead: Merge "Replace ic_settings_language.png asset to the new one" in...Fabrice Di Meglio2014-06-115-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge "Replace ic_settings_language.png asset to the new one" into lmp-previe...Fabrice Di Meglio2014-06-105-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Replace ic_settings_language.png asset to the new oneFabrice Di Meglio2014-06-105-0/+0
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-preview-devBaligh Uddin2014-06-10112-5286/+3957
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-09112-5286/+3957