Geoff Mendal
9a86c08593
Import translations. DO NOT MERGE
...
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
2015-08-24 07:16:24 -07:00
Selim Cinek
dba47d0c7f
am 19551115
: Adapted string length translation limits
...
* commit '19551115dbb3d848be084462342d41addeb1caf6':
Adapted string length translation limits
2015-08-20 19:04:30 +00:00
Selim Cinek
19551115db
Adapted string length translation limits
...
Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
2015-08-20 18:57:22 +00:00
Maurice Lam
d809de8847
Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
2015-08-19 23:51:30 +00:00
Geoff Mendal
d401a062c7
Import translations. DO NOT MERGE
...
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
2015-08-19 07:08:00 -07:00
Maurice Lam
27fa865db7
[Fingerprint] Smaller enrolling ring
...
Make the enrolling progress ring smaller in sw400dp during setup.
Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
2015-08-18 18:30:36 -07:00
Geoff Mendal
3c27420773
Import translations. DO NOT MERGE
...
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
2015-08-17 07:05:00 -07:00
Geoff Mendal
eea96f22a1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
2015-08-12 21:50:09 -07:00
Dianne Hackborn
6a1e1e08a0
am f67d0785
: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0
Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I003564376a02a70f0245353472544cde355240ac
2015-08-12 16:11:46 -07:00
Geoff Mendal
42ae7fba5b
Import translations. DO NOT MERGE
...
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
2015-08-12 07:00:45 -07:00
Dianne Hackborn
e2e76435f4
am 8500822b
: Merge "Fix issue #23079119 : Description for write settings permission says..." into mnc-dev
...
* commit '8500822b8e39473e272a0c4e84349aa9dadf763f':
Fix issue #23079119 : Description for write settings permission says...
2015-08-11 23:26:45 +00:00
Dianne Hackborn
8500822b8e
Merge "Fix issue #23079119 : Description for write settings permission says..." into mnc-dev
2015-08-11 23:17:24 +00:00
Maurice Lam
a430ac56b2
am 3d9cb926
: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
...
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
2015-08-11 22:43:35 +00:00
Maurice Lam
3d9cb92618
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
2015-08-11 22:35:53 +00:00
Dianne Hackborn
4f8b829b24
Fix issue #23079119 : Description for write settings permission says...
...
...it is for read and write
Just write.
And let's say, modify.
Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
2015-08-11 12:17:59 -07:00
Jason Monk
746886c59a
Merge "Add setting to disable camera gesture" into mnc-dr-dev
2015-08-11 13:55:54 +00:00
Dianne Hackborn
fc7633cae2
am ba38155d
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-11 00:11:09 +00:00
Dianne Hackborn
9bedd25c77
Fix issue #23037720 : New Battery Optimization Strings
...
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
2015-08-10 17:03:38 -07:00
Geoff Mendal
41abf66362
Import translations. DO NOT MERGE
...
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
2015-08-10 07:03:46 -07:00
Geoff Mendal
3ca58bbda3
Import translations. DO NOT MERGE
...
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
2015-08-08 07:26:58 -07:00
Dianne Hackborn
7a3a453349
am e7a5966a
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-07 22:05:56 +00:00
Dianne Hackborn
f5497aa93c
Fix issue #23037720 : New Battery Optimization Strings
...
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
2015-08-07 14:43:55 -07:00
Maurice Lam
d62aabf10d
[Fingerprint] Use different ring size for setup
...
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
2015-08-07 10:48:48 -07:00
Geoff Mendal
2d546b77b9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Geoff Mendal
90c2297645
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
2015-08-05 18:24:49 -07:00
Geoff Mendal
7930f872ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
2015-08-05 18:15:07 -07:00
Geoff Mendal
093f37469a
Import translations. DO NOT MERGE
...
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
2015-08-05 07:05:39 -07:00
Maurice Lam
311a2d9525
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
2015-08-05 00:38:37 +00:00
Maurice Lam
2a74b86238
am 8c9136ef
: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:20:06 +00:00
Maurice Lam
8c9136efce
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
2015-08-05 00:09:32 +00:00
Maurice Lam
c48ea1f586
[Fingerprint] Update string for enrolling
...
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
2015-08-04 23:08:10 +00:00
Maurice Lam
289151ccea
[Fingerprint] Update string for enrolling
...
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
2015-08-04 15:44:42 -07:00
Maurice Lam
42b6ad595b
[Fingerprint] Shrink fingerprint progress ring
...
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.
Bug: 22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
2015-08-04 15:06:26 -07:00
Jason Monk
9824c5da1e
resolved conflicts for merge of 1adca55f
to mnc-dr-dev
...
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04:00
Nick Kralevich
1adca55ffe
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
2015-08-04 19:45:58 +00:00
Jason Monk
d30e426976
Add setting to disable camera gesture
...
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
2015-08-04 11:30:50 -04:00
Jason Monk
83290eef8c
Update USB dialog for USB-C power option
...
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
2015-08-04 09:18:57 -04:00
Prem Kumar
b0d10e796f
am eed361bb
: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'eed361bbafc079adb2a33eccee2f0a71d872ad54':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:00:43 +00:00
Maurice Lam
0d6e1da536
am 87fadbe6
: [Fingerprint] Help text for backup screen lock
...
* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
2015-08-04 01:00:29 +00:00
Prem Kumar
eed361bbaf
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
2015-08-04 00:41:47 +00:00
Maurice Lam
87fadbe6d9
[Fingerprint] Help text for backup screen lock
...
Show a help text saying "Choose your backup screen lock method" when
asking the user for backup screen lock during fingerprint enrollment.
A backup translation is specified, using the source string "Set up your
backup screen lock method".
Bug: 22879473
Change-Id: I9b9348141227103e695d1fc78601745cac0309a7
2015-08-03 23:12:09 +00:00
Geoff Mendal
c493f04217
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22847296
Bug: 22816816
Bug: 22644642
Change-Id: Ieddb5bbb9f597eda153f307b62086753dd460e93
2015-08-03 22:16:52 +00:00
Geoff Mendal
052e50dd7f
Import translations. DO NOT MERGE
...
Change-Id: I4a7a4c47fd5d7cb61a2cc319bcfd33867bb234be
Auto-generated-cl: translation import
2015-08-03 07:08:05 -07:00
Geoff Mendal
bd24631d2e
Import translations. DO NOT MERGE
...
Change-Id: I1d0459c20f362248d4d3b065a2d4f6c653555d7a
Auto-generated-cl: translation import
2015-07-31 20:47:02 -07:00
Sanket Padawe
a7a4a5a2cf
Allow Contact sharing by default while connecting Car Kit.
...
Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
2015-07-31 17:22:45 -07:00
Geoff Mendal
13cbe05387
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011
2015-07-31 09:34:46 -07:00
Maurice Lam
09840984e3
am 997bcaa7
: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
[Fingerprint] Advertise wake & unlock during SUW
2015-07-31 00:48:43 +00:00
Maurice Lam
997bcaa7d8
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
2015-07-31 00:43:58 +00:00