Commit Graph

7945 Commits

Author SHA1 Message Date
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
0112cb0897 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I313c60b172c8d6694f577f87ce01e889d4b6da16
2015-08-05 18:05:28 -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
Geoff Mendal
583100e5b2 Import translations. DO NOT MERGE
Change-Id: I8f44336535f1b0068d2d4da91070e965f400bfe7
Auto-generated-cl: translation import
2015-08-05 06:14:46 -07:00
Maurice Lam
70d6cdcae2 am c4ea9b29: am c781bf30: am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit 'c4ea9b29c85837fdbe63a3089338137fd448d79d':
  [Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:51:45 +00:00
Maurice Lam
c4ea9b29c8 am c781bf30: am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit 'c781bf30ad0a10217fa74dbb5a2f61ab165d8b3f':
  [Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:44:00 +00:00
Maurice Lam
311a2d9525 Merge "[Fingerprint] Update string for enrolling" into mnc-dev 2015-08-05 00:38:37 +00:00
Maurice Lam
c781bf30ad am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit 'e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
  [Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:35:27 +00:00
Maurice Lam
e8f7ed9ea0 am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
  [Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:27:22 +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
ac663863e5 am 177cebf7: am 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
* commit '177cebf7e32632bb493fab0f157f7fe4827c0572':
  [Fingerprint] Update string for enrolling
2015-08-04 23:56:34 +00:00
Maurice Lam
177cebf7e3 am 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
* commit '54a34ac6f92577b95fb42ba9c55a230c68f80076':
  [Fingerprint] Update string for enrolling
2015-08-04 23:47:51 +00:00
Maurice Lam
54a34ac6f9 am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
* commit '6eb6f924ac02afa004ea15ccbeecdd16c152b222':
  [Fingerprint] Update string for enrolling
2015-08-04 23:43:00 +00:00
Maurice Lam
6eb6f924ac am c48ea1f5: [Fingerprint] Update string for enrolling
* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
  [Fingerprint] Update string for enrolling
2015-08-04 23:36:09 +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
b3e81e1004 am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:10:14 +00:00
Jason Monk
183fcd5370 am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:03:38 +00:00
Jason Monk
ddb2277810 am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
* commit 'bd776a0bb70b1956e3b7332fb75378df85b04a60':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 20:55:37 +00:00
Jason Monk
bd776a0bb7 am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 20:43:01 +00: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
5d402d59bc am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
  Update USB dialog for USB-C power option
2015-08-04 18:23:57 +00:00
Jason Monk
9390333c84 am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
* commit 'd2af08595073f92eb54d6c08f6d896309b5270d9':
  Update USB dialog for USB-C power option
2015-08-04 18:14:38 +00:00
Jason Monk
d2af085950 am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
* commit '661d1b778828b79851b9ab7fb5d73cf8d3044aa8':
  Update USB dialog for USB-C power option
2015-08-04 18:06:19 +00:00
Jason Monk
661d1b7788 am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
* commit '2e3775b9b143311da66b91c6f1291a4639236d07':
  Update USB dialog for USB-C power option
2015-08-04 17:57:14 +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
cba797450c am 881207b0: am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit '881207b035a47fe5c698b4a99e28325ffa787f74':
  Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:33:19 +00:00
Maurice Lam
24628cbfeb am ce08d4d3: am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit 'ce08d4d30811e251a2437f13ecb6bdfc00e179c4':
  [Fingerprint] Help text for backup screen lock
2015-08-04 01:33:18 +00:00
Prem Kumar
881207b035 am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit 'a2ef9256a102b9610118aede3b5142c8fe047f88':
  Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:23:46 +00:00
Maurice Lam
ce08d4d308 am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '36d6d2ff08d5e9bd9ecaa176f6ebea99c7f7db6f':
  [Fingerprint] Help text for backup screen lock
2015-08-04 01:23:45 +00:00
Prem Kumar
a2ef9256a1 am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit '21adfeebc27869c0b17def319f08a514d325afa3':
  Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:17:19 +00:00
Maurice Lam
36d6d2ff08 am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '4c55266b168bba7bf2b4c5e33972beb0434135e6':
  [Fingerprint] Help text for backup screen lock
2015-08-04 01:17:18 +00:00
Prem Kumar
21adfeebc2 am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit 'b0d10e796f1de43c6db2dba5315d21362a26cbfc':
  Allow Contact sharing by default while connecting Car Kit.
2015-08-04 01:08:49 +00:00
Maurice Lam
4c55266b16 am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '0d6e1da536e99ad9e141812295e67727f78475f6':
  [Fingerprint] Help text for backup screen lock
2015-08-04 01:08:48 +00: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
6bf18266b4 Import translations. DO NOT MERGE
Change-Id: I77ac48aaaf867927d9709c4baf28beabdfc6a98d
Auto-generated-cl: translation import
2015-08-03 06:16:23 -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
Geoff Mendal
b4d1588aed Import translations. DO NOT MERGE
Change-Id: Iba51a7174b4af5f27ce1831fd0ccefcbb1ff2794
Auto-generated-cl: translation import
2015-07-31 19:56:54 -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