summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-devMaurice Lam2015-08-191-2/+2
| |\ \ \
| | * | | [Fingerprint] Smaller enrolling ringMaurice Lam2015-08-181-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Make the enrolling progress ring smaller in sw400dp during setup. Bug: 23216520 Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-08-195-17/+17
| |/ / | | | | | | | | | | | | Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03 Auto-generated-cl: translation import
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-1778-1311/+739
| | | | | | | | | | | | | | | Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759 Auto-generated-cl: translation import
* | | am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch ↵Dianne Hackborn2015-08-132-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | level in Settings" into mnc-dev * commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4': Fix issue #23116383: Include security patch level in Settings
| * | am f67d0785: Merge "Fix issue #23116383: Include security patch level in ↵Dianne Hackborn2015-08-132-0/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | Settings" into mnc-dev * commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336': Fix issue #23116383: Include security patch level in Settings
| | * Merge "Fix issue #23116383: Include security patch level in Settings" into ↵Dianne Hackborn2015-08-132-0/+8
| | |\ | | | | | | | | | | | | mnc-dev
| | | * Fix issue #23116383: Include security patch level in SettingsDianne Hackborn2015-08-122-0/+8
| | | | | | | | | | | | | | | | Change-Id: I003564376a02a70f0245353472544cde355240ac
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-08-1278-863/+1595
| | | | | | | | | | | | | | | | | | | | Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671 Auto-generated-cl: translation import
* | | | am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write ↵Dianne Hackborn2015-08-111-8/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | settings permission says..." into mnc-dev * commit 'e2e76435f4a0604d751b32838409421b072ca25d': Fix issue #23079119: Description for write settings permission says...
| * | | am 8500822b: Merge "Fix issue #23079119: Description for write settings ↵Dianne Hackborn2015-08-111-8/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | permission says..." into mnc-dev * commit '8500822b8e39473e272a0c4e84349aa9dadf763f': Fix issue #23079119: Description for write settings permission says...
| | * | Merge "Fix issue #23079119: Description for write settings permission ↵Dianne Hackborn2015-08-111-8/+8
| | |\ \ | | | | | | | | | | | | | | | says..." into mnc-dev
| | | * | Fix issue #23079119: Description for write settings permission says...Dianne Hackborn2015-08-111-8/+8
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...it is for read and write Just write. And let's say, modify. Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
* | | | am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for ↵Maurice Lam2015-08-115-6/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setup" into mnc-dev * commit 'a430ac56b22da424abeda82ca074ef19d5e9cd56': [Fingerprint] Use different ring size for setup
| * | | am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into ↵Maurice Lam2015-08-115-6/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '3d9cb9261849d8178ce834c8216fe2154db4e5af': [Fingerprint] Use different ring size for setup
| | * | Merge "[Fingerprint] Use different ring size for setup" into mnc-devMaurice Lam2015-08-115-6/+20
| | |\ \ | | | |/ | | |/|
| | | * [Fingerprint] Use different ring size for setupMaurice Lam2015-08-075-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up on ag/741340, to split the size of the fingerprint ring during setup vs in settings. The ring in settings is slightly bigger because the header is smaller and the error text will not be cropped. Bug: 22924280 Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
* | | | am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-devJason Monk2015-08-112-0/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '746886c59a20dc33d62c2dd500fd27edcf0abcca': Add setting to disable camera gesture
| * | | Merge "Add setting to disable camera gesture" into mnc-dr-devJason Monk2015-08-112-0/+13
| |\ \ \
| | * | | Add setting to disable camera gestureJason Monk2015-08-042-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22183841 Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
* | | | | am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery ↵Dianne Hackborn2015-08-111-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Optimization Strings" into mnc-dev * commit 'fc7633cae2aec30f32adbc26d3e24a8005e773f5': Fix issue #23037720: New Battery Optimization Strings
| * | | | am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" ↵Dianne Hackborn2015-08-111-4/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14': Fix issue #23037720: New Battery Optimization Strings
| | * | | Fix issue #23037720: New Battery Optimization StringsDianne Hackborn2015-08-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No, really, these are the strings. Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-1038-149/+75
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721 Auto-generated-cl: translation import
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0880-745/+710
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b Auto-generated-cl: translation import
* | | | | am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery ↵Dianne Hackborn2015-08-071-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Optimization Strings" into mnc-dev * commit '7a3a453349fb51043d84adc21f87472ba34c49a8': Fix issue #23037720: New Battery Optimization Strings
| * | | | am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" ↵Dianne Hackborn2015-08-071-0/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420': Fix issue #23037720: New Battery Optimization Strings
| | * | | Fix issue #23037720: New Battery Optimization StringsDianne Hackborn2015-08-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thar be strings. Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0725-147/+105
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22879473 Bug: 22719051 Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
| | * | Import translations. DO NOT MERGEGeoff Mendal2015-08-05156-1051/+781
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22390723 Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
| | * | Merge "[Fingerprint] Update string for enrolling" into mnc-devMaurice Lam2015-08-051-5/+5
| | |\ \
| | | * | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update string for enrolling to tell the user to move their fingers, so that different parts of their fingerprints can be captured. Also include other minor update to strings mentioned in the bug. Bug: 22719051 Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0560-1386/+780
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22390723 Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-05156-2886/+3249
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11 Auto-generated-cl: translation import
* | | | | am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ↵Maurice Lam2015-08-051-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ring" into mnc-dev * commit '2a74b8623816b961f3da7f45f080e61067f951e6': [Fingerprint] Shrink fingerprint progress ring
| * | | | am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a': [Fingerprint] Shrink fingerprint progress ring
| | * | | Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [Fingerprint] Shrink fingerprint progress ringMaurice Lam2015-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the fingerprint progress ring smaller so that the error message can be seen on Nexus 5 during setup. Bug: 22924280 Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
* | | | | am c48ea1f5: [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a': [Fingerprint] Update string for enrolling
| * | | | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update string for enrolling to tell the user to move their fingers, so that different parts of their fingerprints can be captured. Also include other minor update to strings mentioned in the bug. Bug: 22719051 Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
* | | | | am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-devJason Monk2015-08-041-8/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '9824c5da1efa9750fb19d477d29875a08289ecf5': UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
| * | | | resolved conflicts for merge of 1adca55f to mnc-dr-devJason Monk2015-08-041-8/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
| | * | | Merge "UsbModeChooserActivity: Ensure MIDI available with ↵Nick Kralevich2015-08-041-8/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | DISALLOW_USB_FILE_TRANSFER" into mnc-dev
| | | * | | UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFERNick Kralevich2015-07-301-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ec323a0849155302b3b522fe34a2638be74af420, DISALLOW_USB_FILE_TRANSFER turned off all USB options except for "Charge Only". This is too aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER is set. Remove mUsbManager.isUsbDataUnlocked(). That data is available by accessing the sticky broadcast. Bug: 22447614 Bug: 21429947 Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
* | | | | | am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-devJason Monk2015-08-043-8/+62
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '2e3775b9b143311da66b91c6f1291a4639236d07': Update USB dialog for USB-C power option
| * | | | | Update USB dialog for USB-C power optionJason Monk2015-08-043-8/+62
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a bit of visual updates, options now have summaries as well. Code has been refactored a bit, and is more flexible to easily support any kind of power/data flow combination once its time to support that. Currently devices don't have USB-C ports, they can be simulated with the following commands: $ adb shell dumpsys usb add-port "matrix" dual # ?s control whether these can be changed $ adb shell dumpsys usb connect-port "matrix" ufp? sink? device? # Do testing here $ adb shell dumpsys usb disconnect-port "matrix" $ adb shell dumpsys usb remove-port "matrix" $ adb shell dumpsys usb reset # Use the help for more info $ adb shell dumpsys usb -h Bug: 21615151 Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
* | | | | am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while ↵Prem Kumar2015-08-042-29/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | connecting Car Kit." into mnc-dev * commit 'b0d10e796f1de43c6db2dba5315d21362a26cbfc': Allow Contact sharing by default while connecting Car Kit.
| * | | | am eed361bb: Merge "Allow Contact sharing by default while connecting Car ↵Prem Kumar2015-08-042-29/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Kit." into mnc-dev * commit 'eed361bbafc079adb2a33eccee2f0a71d872ad54': Allow Contact sharing by default while connecting Car Kit.
| | * | | Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-devPrem Kumar2015-08-042-29/+6
| | |\ \ \
| | | * | | Allow Contact sharing by default while connecting Car Kit.Sanket Padawe2015-07-312-29/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22556703 Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
generated by cgit v1.1 at 2025-01-30 05:00:43 +0000