OSDN Git Service
Sanket Padawe [Wed, 12 Aug 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
Geoff Mendal [Wed, 12 Aug 2015 14:00:45 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
Sanket Padawe [Wed, 12 Aug 2015 01:42:36 +0000 (18:42 -0700)]
Avoid sending identity along with EAP sim, aka & aka'.
Bug:
22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
Andres Morales [Tue, 11 Aug 2015 23:35:59 +0000 (23:35 +0000)]
am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 23:26:45 +0000 (23:26 +0000)]
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...
Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]
Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]
[ConfirmPattern] use correct user id for stealth mode
Bug:
23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
Maurice Lam [Tue, 11 Aug 2015 22:43:35 +0000 (22:43 +0000)]
am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Paul Lawrence [Tue, 11 Aug 2015 22:20:53 +0000 (22:20 +0000)]
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
Paul Lawrence [Mon, 3 Aug 2015 16:44:23 +0000 (09:44 -0700)]
Gray out confirm button on pattern/pin/password set dialog
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.
Note that this requires async tasks so that the button is shown as gray
in a timely way.
Also don't add another stage - this causes a11y to repeat the title.
Bug:
22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]
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
Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]
Merge "Add setting to disable camera gesture" into mnc-dr-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:19:40 +0000 (00:19 +0000)]
am
be4df036: Fix issue #
23037899: Support for Battery Optimization permission + Dialog
* commit '
be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Tue, 11 Aug 2015 00:11:09 +0000 (00:11 +0000)]
am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
Dianne Hackborn [Mon, 10 Aug 2015 22:02:23 +0000 (22:02 +0000)]
am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 20:37:34 +0000 (20:37 +0000)]
am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
Jason Monk [Mon, 10 Aug 2015 20:14:46 +0000 (20:14 +0000)]
am
cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit '
cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage
Jason Monk [Mon, 10 Aug 2015 20:09:20 +0000 (20:09 +0000)]
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
Jason Monk [Mon, 10 Aug 2015 19:58:09 +0000 (15:58 -0400)]
Remove extra help & feedback menu from power usage
Bug:
23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:35:16 +0000 (17:35 +0000)]
am
8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
* commit '
8cf54264995aea65d77c25b5050cb3aac0196c59':
Ensure that listener is removed only if it was added
Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:29:38 +0000 (17:29 +0000)]
Merge "Ensure that listener is removed only if it was added" into mnc-dev
Geoff Mendal [Mon, 10 Aug 2015 14:03:46 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
Geoff Mendal [Sat, 8 Aug 2015 14:26:58 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
Jeff Sharkey [Fri, 7 Aug 2015 23:51:57 +0000 (23:51 +0000)]
am
67f0739c: Merge "Block moving when already in progress." into mnc-dev
* commit '
67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev
Jeff Sharkey [Fri, 7 Aug 2015 22:59:28 +0000 (15:59 -0700)]
Block moving when already in progress.
Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.
Bug:
22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d
Billy Lau [Fri, 7 Aug 2015 22:22:19 +0000 (22:22 +0000)]
am
a59f39fc: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 22:05:56 +0000 (22:05 +0000)]
am
e7a5966a: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
Thar be strings.
Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
There be strings.
Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
Pavel Zhamaitsiak [Fri, 7 Aug 2015 19:02:38 +0000 (12:02 -0700)]
Ensure that listener is removed only if it was added
Bug:
23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
Maurice Lam [Wed, 5 Aug 2015 04:29:07 +0000 (21:29 -0700)]
[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
Julia Reynolds [Fri, 7 Aug 2015 16:34:58 +0000 (16:34 +0000)]
am
5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
* commit '
5ab0e183abdd4008c5591011804d0bc770851a7f':
Hide optimization control on battery details page for non whitelisted apps.
Julia Reynolds [Fri, 7 Aug 2015 16:29:41 +0000 (16:29 +0000)]
Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
Geoff Mendal [Fri, 7 Aug 2015 04:44:05 +0000 (04:44 +0000)]
am
2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '
2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 7 Aug 2015 04:20:12 +0000 (21:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22879473
Bug:
22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
Andres Morales [Thu, 6 Aug 2015 22:30:55 +0000 (22:30 +0000)]
am
4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '
4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "fix CC for work profiles" into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 18:21:31 +0000 (14:21 -0400)]
Wrap text on long preferences.
Bug:
22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
Julia Reynolds [Thu, 6 Aug 2015 14:54:44 +0000 (10:54 -0400)]
Hide optimization control on battery details page for non whitelisted apps.
Bug:
22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
Geoff Mendal [Thu, 6 Aug 2015 04:20:33 +0000 (04:20 +0000)]
am
7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '
7930f872ad6b3f0e27c41d848131204eac0cd705':
Import translations. DO NOT MERGE
Andres Morales [Tue, 4 Aug 2015 23:55:00 +0000 (16:55 -0700)]
fix CC for work profiles
Bug:
22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
Geoff Mendal [Thu, 6 Aug 2015 01:24:49 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
Jason Monk [Wed, 5 Aug 2015 20:30:40 +0000 (20:30 +0000)]
am
888673bd: Hide show/hide system from battery optimizations list
* commit '
888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]
am
151612fb: am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
151612fb0de35fd2fadb096511f108b433100149':
Check for special char when renaming device for Wi-Fi direct.
Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]
Hide show/hide system from battery optimizations list
Bug:
22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
am
5f9d15ed: am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am
86d85300: am
19336da3: am
ac2347c0: am
158fa952: am
df9b13af: am
74d85949: am
e05f7143: Check for special char when renaming device for Wi-Fi direct.
* commit '
86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
Ajay Panicker [Wed, 5 Aug 2015 18:01:14 +0000 (18:01 +0000)]
am
cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit '
cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
Implement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 16:48:13 +0000 (16:48 +0000)]
am
244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '
244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev
Geoff Mendal [Wed, 5 Aug 2015 14:05:39 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
Maurice Lam [Wed, 5 Aug 2015 00:46:11 +0000 (00:46 +0000)]
am
311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '
311a2d952522eb61a513670a32462d22504401b1':
[Fingerprint] Update string for enrolling
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:20:06 +0000 (00:20 +0000)]
am
8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '
8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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
Billy Lau [Sat, 1 Aug 2015 17:12:33 +0000 (18:12 +0100)]
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
Ajay Panicker [Wed, 29 Jul 2015 18:39:16 +0000 (11:39 -0700)]
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
Maurice Lam [Tue, 4 Aug 2015 22:05:23 +0000 (15:05 -0700)]
[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
Jason Monk [Tue, 4 Aug 2015 20:23:32 +0000 (16:23 -0400)]
resolved conflicts for merge of
1adca55f to mnc-dr-dev
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
Nick Kralevich [Tue, 4 Aug 2015 19:45:58 +0000 (19:45 +0000)]
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
Jason Monk [Tue, 4 Aug 2015 19:25:32 +0000 (15:25 -0400)]
Remove summaries fro configure apps page
Bug:
22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
Jason Monk [Tue, 4 Aug 2015 17:44:00 +0000 (17:44 +0000)]
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 15:22:29 +0000 (11:22 -0400)]
Add setting to disable camera gesture
Bug:
22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
Jason Monk [Tue, 4 Aug 2015 13:57:27 +0000 (13:57 +0000)]
am
f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit '
f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
Jason Monk [Tue, 4 Aug 2015 13:44:10 +0000 (09:44 -0400)]
Make sure accessibility service desc isn't clickable
Bug:
21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9
Jason Monk [Wed, 29 Jul 2015 18:53:35 +0000 (14:53 -0400)]
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
Dianne Hackborn [Tue, 4 Aug 2015 01:12:29 +0000 (01:12 +0000)]
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
Dianne Hackborn [Tue, 4 Aug 2015 01:07:36 +0000 (01:07 +0000)]
Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
Chris Tate [Tue, 4 Aug 2015 01:06:46 +0000 (01:06 +0000)]
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
Prem Kumar [Tue, 4 Aug 2015 01:00:43 +0000 (01:00 +0000)]
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.
Maurice Lam [Tue, 4 Aug 2015 01:00:29 +0000 (01:00 +0000)]
am
87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '
87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
Geoff Mendal [Tue, 4 Aug 2015 00:59:53 +0000 (00:59 +0000)]
am
c493f042: (-s ours) Import translations. DO NOT MERGE
* commit '
c493f0421773fba528494d98e396c34f6815fe7b':
Import translations. DO NOT MERGE
Chris Tate [Tue, 4 Aug 2015 00:56:24 +0000 (00:56 +0000)]
Merge "Explain properly when apps can open multiple hosts' links" into mnc-dev
Christopher Tate [Tue, 4 Aug 2015 00:46:30 +0000 (17:46 -0700)]
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
Prem Kumar [Tue, 4 Aug 2015 00:41:47 +0000 (00:41 +0000)]
Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
Dianne Hackborn [Tue, 4 Aug 2015 00:17:10 +0000 (17:17 -0700)]
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
Maurice Lam [Mon, 3 Aug 2015 22:33:25 +0000 (15:33 -0700)]
[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
Geoff Mendal [Mon, 3 Aug 2015 22:15:10 +0000 (15:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22847296
Bug:
22816816
Bug:
22644642
Change-Id: Ieddb5bbb9f597eda153f307b62086753dd460e93
Geoff Mendal [Mon, 3 Aug 2015 14:08:05 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a7a4c47fd5d7cb61a2cc319bcfd33867bb234be
Auto-generated-cl: translation import
Geoff Mendal [Sat, 1 Aug 2015 03:47:02 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d0459c20f362248d4d3b065a2d4f6c653555d7a
Auto-generated-cl: translation import
Vinit Deshpande [Sat, 1 Aug 2015 00:35:02 +0000 (00:35 +0000)]
am
b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit '
b74c0b2a27f4d30628fe4482a9de6387c6dbdaca':
wifi: Check for the sizeof ssid to start SoftAP
Vinit Deshpande [Sat, 1 Aug 2015 00:26:01 +0000 (00:26 +0000)]
Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
Sanket Padawe [Sat, 1 Aug 2015 00:22:45 +0000 (17:22 -0700)]
Allow Contact sharing by default while connecting Car Kit.
Bug:
22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
Sunil Dutt [Thu, 2 Jul 2015 09:58:58 +0000 (15:28 +0530)]
wifi: Check for the sizeof ssid to start SoftAP
Disable the option to start SoftAP if ssid byte length is over 32 bytes.
Bug:
22074821
Change-Id: I696dca1aac8673bff168481fde4b013450bac72c
Jim Miller [Fri, 31 Jul 2015 23:48:15 +0000 (23:48 +0000)]
am
efaa19d9: Fix fingerprint enrolling bug.
* commit '
efaa19d97d4aba1897357971af4c0991af71dbbd':
Fix fingerprint enrolling bug.
Jim Miller [Fri, 31 Jul 2015 21:05:25 +0000 (14:05 -0700)]
Fix fingerprint enrolling bug.
This fixes a bug where rotating the device would call post_enroll()
too early, thus invalidating the current session.
Fixes bug
22708390
Change-Id: Ib4a334b50c16630b4fe4b451f6019d41225b2011