Commit Graph

21708 Commits

Author SHA1 Message Date
Julia Reynolds
a9490b6860 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.
2015-08-07 16:35:56 +00:00
Julia Reynolds
5ab0e183ab Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 2015-08-07 16:29:41 +00:00
Geoff Mendal
acf198a7ac am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
  Import translations. DO NOT MERGE
2015-08-07 04:44:33 +00: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
Andres Morales
af2ea2f4dd am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles
2015-08-06 22:30:57 +00:00
Andres Morales
4897fa87a5 Merge "fix CC for work profiles" into mnc-dev 2015-08-06 22:22:17 +00:00
Julia Reynolds
2f01c5f5b5 Hide optimization control on battery details page for non whitelisted apps.
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Geoff Mendal
9acc740ed2 am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
  Import translations. DO NOT MERGE
2015-08-06 04:20:06 +00:00
Andres Morales
7bdffd85eb fix CC for work profiles
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
2015-08-05 19:57:51 -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
Jason Monk
aceedc73ae am 888673bd: Hide show/hide system from battery optimizations list
* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list
2015-08-05 20:31:58 +00:00
Sanket Padawe
086dde011f 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.
2015-08-05 20:13:14 +00:00
Jason Monk
888673bd51 Hide show/hide system from battery optimizations list
Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
2015-08-05 16:08:00 -04:00
Sanket Padawe
151612fb0d 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.
2015-08-05 20:07:15 +00:00
Sanket Padawe
5f9d15ed25 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.
2015-08-05 18:28:12 +00:00
Ajay Panicker
8c0139b1c8 am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
  Implement Bluetooth settings factory reset (5/5)
2015-08-05 18:00:54 +00:00
Ajay Panicker
cd8acb2256 Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev 2015-08-05 17:49:08 +00:00
Jason Monk
12c70b7c77 am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
  Remove summaries fro configure apps page
2015-08-05 14:39:34 +00:00
Jason Monk
244fd78205 Merge "Remove summaries fro configure apps page" into mnc-dev 2015-08-05 14:34:14 +00:00
Maurice Lam
a2f78eafca am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
* commit '311a2d952522eb61a513670a32462d22504401b1':
  [Fingerprint] Update string for enrolling
2015-08-05 00:46:45 +00:00
Maurice Lam
311a2d9525 Merge "[Fingerprint] Update string for enrolling" into mnc-dev 2015-08-05 00:38:37 +00:00
Maurice Lam
6863fac224 am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
  [Fingerprint] Shrink fingerprint progress ring
2015-08-05 00:17:56 +00:00
Maurice Lam
8c9136efce Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 2015-08-05 00:09:32 +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
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
Nick Kralevich
8a85dcc9b4 am 1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
* commit '1adca55ffe10f1741e5fb75bf0e7530ca200d712':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 19:52:44 +00: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
25adfb004d am f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
  Make sure accessibility service desc isn't clickable
2015-08-04 13:55:14 +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
Dianne Hackborn
50cb6411fa 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 03:10:35 +00:00
Chris Tate
5977cfdf91 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 03:10:34 +00:00
Prem Kumar
0694de9397 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 03:10:26 +00:00
Maurice Lam
01495108f1 am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
  [Fingerprint] Help text for backup screen lock
2015-08-04 03:10:07 +00:00
Geoff Mendal
a5af13758a am c493f042: (-s ours) Import translations. DO NOT MERGE
* commit 'c493f0421773fba528494d98e396c34f6815fe7b':
  Import translations. DO NOT MERGE
2015-08-04 03:09:17 +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
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
Vinit Deshpande
96ae93e4d6 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
2015-08-01 00:35:01 +00:00
Vinit Deshpande
b74c0b2a27 Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev 2015-08-01 00:26:01 +00: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
Sunil Dutt
48c3656944 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
2015-07-31 17:20:17 -07:00
Jim Miller
fe87f19bc8 am efaa19d9: Fix fingerprint enrolling bug.
* commit 'efaa19d97d4aba1897357971af4c0991af71dbbd':
  Fix fingerprint enrolling bug.
2015-07-31 23:49:08 +00:00
Jim Miller
efaa19d97d 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
2015-07-31 23:17:24 +00:00
Maurice Lam
e1548aba28 am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit '88832a3d4d48b94a3c43a6240dff75b5d486681b':
  [Fingerprint] Disable back in setup enrolling screen
2015-07-31 19:02:30 +00:00