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
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
Billy Lau
3d9c7fc998
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
...
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].
Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
2015-08-04 23:44:36 +01:00
Ajay Panicker
568d9336ba
Implement Bluetooth settings factory reset (5/5)
...
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug: 16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
2015-08-04 15:28:16 -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
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
c5291b87b3
Remove summaries fro configure apps page
...
Bug: 22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
2015-08-04 15:25:32 -04: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
2e3775b9b1
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
2015-08-04 17:44:00 +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
92f7b48eb7
am 7bed7f04
: am 3daefe4c
: am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit '7bed7f044311d08b3e602583311317c7e2f09a65':
Make sure accessibility service desc isn't clickable
2015-08-04 14:13:38 +00:00
Jason Monk
7bed7f0443
am 3daefe4c
: am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit '3daefe4c94fc2f411f100ba2488322fe9885d362':
Make sure accessibility service desc isn't clickable
2015-08-04 14:04:19 +00:00
Jason Monk
3daefe4c94
am f61ead7a
: Make sure accessibility service desc isn\'t clickable
...
* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
2015-08-04 13:57:27 +00:00
Jason Monk
f61ead7ad6
Make sure accessibility service desc isn't clickable
...
Bug: 21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9
2015-08-04 09:44:10 -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
Dianne Hackborn
437c0d2547
am a180141e
: am e86b170d
: am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'a180141e329371b947771b907cb7cbc60b628fe8':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:24:14 +00:00
Chris Tate
deb879cc5b
am e09bfe34
: am bd3d49f7
: am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'e09bfe34d985320bea7e9b924dd0910cf639fa33':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:24:13 +00:00
Dianne Hackborn
a180141e32
am e86b170d
: am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'e86b170d7faf32d0677122c7273545a0144cc438':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:19:52 +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
Geoff Mendal
28a4f1fdf7
am 568c167b
: (-s ours) am 8b046c1a
: (-s ours) am c493f042
: (-s ours) Import translations. DO NOT MERGE
...
* commit '568c167b3c99f628165c823f1c5b0cacf8a462a2':
Import translations. DO NOT MERGE
2015-08-04 01:17:17 +00:00
Chris Tate
e09bfe34d9
am bd3d49f7
: am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit 'bd3d49f78712b12db99ef316e8ec42eb94ea0f06':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:15:39 +00:00
Dianne Hackborn
e86b170d7f
am f426126a
: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:12:29 +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
Geoff Mendal
568c167b3c
am 8b046c1a
: (-s ours) am c493f042
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8b046c1a4d34873a1e587769fd79f6777836a2a3':
Import translations. DO NOT MERGE
2015-08-04 01:08:47 +00:00
Dianne Hackborn
f426126a76
Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
2015-08-04 01:07:36 +00:00
Chris Tate
bd3d49f787
am 6e64e22e
: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '6e64e22ec72ac3adfb530f57925e1d4fe1c332dc':
Explain properly when apps can open multiple hosts' links
2015-08-04 01:06:46 +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
Geoff Mendal
8b046c1a4d
am c493f042
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c493f0421773fba528494d98e396c34f6815fe7b':
Import translations. DO NOT MERGE
2015-08-04 00:59:53 +00:00
Chris Tate
6e64e22ec7
Merge "Explain properly when apps can open multiple hosts' links" into mnc-dev
2015-08-04 00:56:24 +00:00
Christopher Tate
d485c6b13d
Explain properly when apps can open multiple hosts' links
...
The app link settings "Open by default" detail view was showing
only one host under label "Supported links," improperly implying
that the app would only open that host's links. The summary now
matches the 'App links' view's, explaining "Open $HOST and related
URLs" for apps with more than one.
Tapping on the item has always shown the full list of hosts
advertised by the app, and this remains unchanged.
Bug 22769535
Change-Id: I2be409df64639eb0f2b43a06e3195796c3a3df8b
2015-08-03 17:46:30 -07: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
Dianne Hackborn
2dbeb423a9
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
...
The settings activities that get launched directly by voice now
protect themselves to only execute if they were actually directly
launched by the voice interaction service, rather than allowing
any activity currently under voice control to abuse them.
Note the original code also allowed them to execute regardless of
whether they were running under voice, since it allowed for a null
saved state. I assume that was a mistake, so have removed it.
Change-Id: Ib2269a7ee13016d300afba7fa257bfaca8990fab
2015-08-03 17:17:10 -07: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
69fcacc296
am 7ddac827
: (-s ours) am 052e50dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7ddac827941c2a4f493b105527eb2728d619f270':
Import translations. DO NOT MERGE
2015-08-03 14:27:30 +00:00
Geoff Mendal
7ddac82794
am 052e50dd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '052e50dd7f736a812b032c0348e02e77c0c1f832':
Import translations. DO NOT MERGE
2015-08-03 14:18:20 +00:00