OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)]
am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '18d8682802460074f4b0e628bae4d4051d542c77':
  Import translations. DO NOT MERGE

8 years agoam 90c22976: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:45 +0000 (04:20 +0000)]
am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '90c2297645341f347f56b160f06551963c64d039':
  Import translations. DO NOT MERGE

8 years agoam 7930f872: (-s ours) Import translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoam 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:37:17 +0000 (20:37 +0000)]
am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
  Hide show/hide system from battery optimizations list

8 years agoam 888673bd: Hide show/hide system from battery optimizations list
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

8 years agoam ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am...
Sanket Padawe [Wed, 5 Aug 2015 20:20:47 +0000 (20:20 +0000)]
am ac02e250: 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 'ac02e250c1540c85c29e0ae753cb365c155c2968':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am...
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.

8 years agoHide show/hide system from battery optimizations list
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

8 years agoam 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am...
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.

8 years agoam 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am...
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.

8 years agoam 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5...
Ajay Panicker [Wed, 5 Aug 2015 18:16:29 +0000 (18:16 +0000)]
am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit '1dd985abdc5e2a04cf97b4dce778db89891e5064':
  Implement Bluetooth settings factory reset (5/5)

8 years agoam cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
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)

8 years agoMerge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

8 years agoam c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 17:01:02 +0000 (17:01 +0000)]
am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev

* commit 'c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
  Remove summaries fro configure apps page

8 years agoam 244fd782: Merge "Remove summaries fro configure apps page" 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

8 years agoMerge "Remove summaries fro configure apps page" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev

8 years agoam 093f3746: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:30:37 +0000 (14:30 +0000)]
am 093f3746: (-s ours) Import translations. DO NOT MERGE

* commit '093f37469ae513c273b5d1ab44793f1041888676':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
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

8 years agoam 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into...
Maurice Lam [Wed, 5 Aug 2015 00:56:58 +0000 (00:56 +0000)]
am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit '596a8a3c0ac4e931c52e3f4b391d4d4dca1fdcf6':
  [Fingerprint] Update string for enrolling

8 years agoam 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
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

8 years agoMerge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev

8 years agoam 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring"...
Maurice Lam [Wed, 5 Aug 2015 00:27:22 +0000 (00:27 +0000)]
am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
  [Fingerprint] Shrink fingerprint progress ring

8 years agoam 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" 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

8 years agoMerge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

8 years agoam c48ea1f5: [Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:36:09 +0000 (23:36 +0000)]
am c48ea1f5: [Fingerprint] Update string for enrolling

* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
  [Fingerprint] Update string for enrolling

8 years ago[Fingerprint] Update string for enrolling
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

8 years ago[Fingerprint] Update string for enrolling
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

8 years agoImplement Bluetooth settings factory reset (5/5)
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

8 years ago[Fingerprint] Shrink fingerprint progress ring
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

8 years agoam 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 20:43:01 +0000 (20:43 +0000)]
am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

8 years agoresolved conflicts for merge of 1adca55f to mnc-dr-dev
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

8 years agoMerge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER...
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

8 years agoRemove summaries fro configure apps page
Jason Monk [Tue, 4 Aug 2015 19:25:32 +0000 (15:25 -0400)]
Remove summaries fro configure apps page

Bug: 22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e

8 years agoam 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 17:57:14 +0000 (17:57 +0000)]
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

8 years agoMerge "Update USB dialog for USB-C power option" into mnc-dr-dev
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

8 years agoam 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
Jason Monk [Tue, 4 Aug 2015 14:04:19 +0000 (14:04 +0000)]
am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit '3daefe4c94fc2f411f100ba2488322fe9885d362':
  Make sure accessibility service desc isn't clickable

8 years agoam f61ead7a: Make sure accessibility service desc isn\'t clickable
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

8 years agoMake 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

8 years agoUpdate USB dialog for USB-C power option
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

8 years agoam e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber...
Dianne Hackborn [Tue, 4 Aug 2015 01:19:52 +0000 (01:19 +0000)]
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

8 years agoam bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts...
Chris Tate [Tue, 4 Aug 2015 01:15:39 +0000 (01:15 +0000)]
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

8 years agoam f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in...
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

8 years agoam b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting...
Prem Kumar [Tue, 4 Aug 2015 01:08:49 +0000 (01:08 +0000)]
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.

8 years agoam 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
Maurice Lam [Tue, 4 Aug 2015 01:08:48 +0000 (01:08 +0000)]
am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock

* commit '0d6e1da536e99ad9e141812295e67727f78475f6':
  [Fingerprint] Help text for backup screen lock

8 years agoam 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 4 Aug 2015 01:08:47 +0000 (01:08 +0000)]
am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit '8b046c1a4d34873a1e587769fd79f6777836a2a3':
  Import translations. DO NOT MERGE

8 years agoMerge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into...
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

8 years agoam 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into...
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

8 years agoam eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into...
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.

8 years agoam 87fadbe6: [Fingerprint] Help text for backup screen lock
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

8 years agoam c493f042: (-s ours) Import translations. DO NOT MERGE
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

8 years agoMerge "Explain properly when apps can open multiple hosts' links" into mnc-dev
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

8 years agoExplain properly when apps can open multiple hosts' links
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

8 years agoMerge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
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

8 years agoFix issue #22860466: viapi security bug - rubber stamping in nested VIs
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

8 years ago[Fingerprint] Help text for backup screen lock
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

8 years agoImport translations. DO NOT MERGE
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

8 years agoam 052e50dd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Aug 2015 14:18:20 +0000 (14:18 +0000)]
am 052e50dd: (-s ours) Import translations. DO NOT MERGE

* commit '052e50dd7f736a812b032c0348e02e77c0c1f832':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
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

8 years agoam bd24631d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 16:38:45 +0000 (16:38 +0000)]
am bd24631d: (-s ours) Import translations. DO NOT MERGE

* commit 'bd24631d2e468119eeab658d434dead4d05f56b7':
  Import translations. DO NOT MERGE

8 years agoam 5acb871c: am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP...
Vinit Deshpande [Sat, 1 Aug 2015 16:38:12 +0000 (16:38 +0000)]
am 5acb871c: am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev

* commit '5acb871c0b7660a63f7b0708b65673a2f63fb165':
  wifi: Check for the sizeof ssid to start SoftAP

8 years agoam 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.
Jim Miller [Sat, 1 Aug 2015 16:37:53 +0000 (16:37 +0000)]
am 0a8b6f2b: am efaa19d9: Fix fingerprint enrolling bug.

* commit '0a8b6f2b9a1b16831565c932b707c59f2ec36491':
  Fix fingerprint enrolling bug.

8 years agoam 9d490b50: am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen...
Maurice Lam [Sat, 1 Aug 2015 16:34:40 +0000 (16:34 +0000)]
am 9d490b50: am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev

* commit '9d490b50406387a55dc3976cf3cf14ef09d9f98e':
  [Fingerprint] Disable back in setup enrolling screen

8 years agoam bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 1 Aug 2015 16:34:39 +0000 (16:34 +0000)]
am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE

* commit 'bbd703914a81b63e15e32a3530d815298f4a6f8c':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
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

8 years agoam b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
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

8 years agoMerge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
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

8 years agoAllow Contact sharing by default while connecting Car Kit.
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

8 years agowifi: Check for the sizeof ssid to start SoftAP
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

8 years agoam efaa19d9: Fix fingerprint enrolling bug.
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.

8 years agoFix 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

8 years agoam 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 19:43:17 +0000 (19:43 +0000)]
am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev

* commit '88832a3d4d48b94a3c43a6240dff75b5d486681b':
  [Fingerprint] Disable back in setup enrolling screen

8 years agoam 13cbe053: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 31 Jul 2015 19:41:55 +0000 (19:41 +0000)]
am 13cbe053: (-s ours) Import translations. DO NOT MERGE

* commit '13cbe05387fe387c88f39f9121a8283121e96bdc':
  Import translations. DO NOT MERGE

8 years agoMerge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 18:50:39 +0000 (18:50 +0000)]
Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 31 Jul 2015 16:34:46 +0000 (09:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22512392
Change-Id: I2a2bc8f493371e83373ec3587008f51a3cecc011

8 years agoam b456493a: am c7e59e52: Merge "Let Settings measure transient free space." into...
Jeff Sharkey [Fri, 31 Jul 2015 01:57:38 +0000 (01:57 +0000)]
am b456493a: am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev

* commit 'b456493ad5097dd3713649deeb8452e498c55ea9':
  Let Settings measure transient free space.

8 years agoam c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
Jeff Sharkey [Fri, 31 Jul 2015 01:51:31 +0000 (01:51 +0000)]
am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev

* commit 'c7e59e52b45b66de74597a455023dd9fe4e07b3b':
  Let Settings measure transient free space.

8 years agoMerge "Let Settings measure transient free space." into mnc-dev
Jeff Sharkey [Fri, 31 Jul 2015 01:46:44 +0000 (01:46 +0000)]
Merge "Let Settings measure transient free space." into mnc-dev

8 years agoam 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW...
Maurice Lam [Fri, 31 Jul 2015 00:55:16 +0000 (00:55 +0000)]
am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

* commit '09840984e317c12d3ead3b1d16c65844f363e8c5':
  [Fingerprint] Advertise wake & unlock during SUW

8 years agoLet Settings measure transient free space.
Jeff Sharkey [Thu, 30 Jul 2015 23:55:42 +0000 (16:55 -0700)]
Let Settings measure transient free space.

Transient volumes like USB drives are only mounted at /mnt/media_rw,
but they still appear in Settings > Storage.  To show stats like
free/used space, give Settings the permissions it needs to access
devices mounted there.

Bug: 22545248
Change-Id: I50be38f02f7d2bfe51d1ac0f76a04c340a21f936

8 years agoam 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 00:48:43 +0000 (00:48 +0000)]
am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

* commit '997bcaa7d8486814540d8bcf1269918d8c48d960':
  [Fingerprint] Advertise wake & unlock during SUW

8 years agoMerge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
Maurice Lam [Fri, 31 Jul 2015 00:43:58 +0000 (00:43 +0000)]
Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev

8 years ago[Fingerprint] Advertise wake & unlock during SUW
Maurice Lam [Thu, 30 Jul 2015 22:07:58 +0000 (15:07 -0700)]
[Fingerprint] Advertise wake & unlock during SUW

Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.

Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257

8 years agoUsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
Nick Kralevich [Thu, 30 Jul 2015 23:32:48 +0000 (16:32 -0700)]
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

In ec323a0849155302b3b522fe34a2638be74af420, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.

Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0

8 years agoam d5974497: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 23:16:06 +0000 (23:16 +0000)]
am d5974497: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE

* commit 'd5974497caa856fbeb18e482ca0b427873327356':
  Import translations. DO NOT MERGE

8 years agoam 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 23:10:36 +0000 (23:10 +0000)]
am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE

* commit '6b0a2d21e65ab1c29aec925380bbf43bab22c2c1':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 22:54:40 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22672924
Change-Id: I99789b790e682308514351a13025b9625ec085e1

8 years agoam 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permissio...
Fyodor Kupolov [Thu, 30 Jul 2015 21:01:20 +0000 (21:01 +0000)]
am 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit '74f8cb9c9bf2c354a17ce155977dc9d8bead000a':
  Added android.permission.PEERS_MAC_ADDRESS permission

8 years agoam c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Fyodor Kupolov [Thu, 30 Jul 2015 20:54:10 +0000 (20:54 +0000)]
am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit 'c3067882dbf00e424cd146181cf15f33ecb9f8f8':
  Added android.permission.PEERS_MAC_ADDRESS permission

8 years agoMerge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Fyodor Kupolov [Thu, 30 Jul 2015 20:50:03 +0000 (20:50 +0000)]
Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

8 years ago[Fingerprint] Disable back in setup enrolling screen
Maurice Lam [Thu, 30 Jul 2015 20:29:20 +0000 (13:29 -0700)]
[Fingerprint] Disable back in setup enrolling screen

Disable the back button because the back stack behavior is confusing.
Instead of going back to the screen the user previously saw, pressing
back in enrolling screen goes back to FindSensor.

Bug: 22848016
Change-Id: I71852eb1974f1542fb519bf8bbfdce12de62e66b

8 years agoam 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal"...
Jorim Jaggi [Thu, 30 Jul 2015 20:28:59 +0000 (20:28 +0000)]
am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev

* commit '80d5c9313d48a49d5216ab3a65ac88e1cb3b9c18':
  Add dialog to confirm last fingerprint removal

8 years agoam 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
Jorim Jaggi [Thu, 30 Jul 2015 20:22:14 +0000 (20:22 +0000)]
am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev

* commit '92f9bdc6ec6f4a0653fc5f3590b4fd889259fde3':
  Add dialog to confirm last fingerprint removal

8 years agoMerge "Add dialog to confirm last fingerprint removal" into mnc-dev
Jorim Jaggi [Thu, 30 Jul 2015 20:16:08 +0000 (20:16 +0000)]
Merge "Add dialog to confirm last fingerprint removal" into mnc-dev

8 years agoAdd dialog to confirm last fingerprint removal
Jorim Jaggi [Thu, 30 Jul 2015 19:41:42 +0000 (12:41 -0700)]
Add dialog to confirm last fingerprint removal

Bug: 22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa

8 years agoam 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into...
Jeff Sharkey [Thu, 30 Jul 2015 19:38:48 +0000 (19:38 +0000)]
am 7f3026c3: am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

* commit '7f3026c3ca5f8e265da0904f81d899408527c142':
  Refresh after clearing, tweak warn threshold.

8 years agoam bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 19:32:36 +0000 (19:32 +0000)]
am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

* commit 'bb9d6b906e564c9f685834bb7dcccfbe0aa87a29':
  Refresh after clearing, tweak warn threshold.

8 years agoMerge "Refresh after clearing, tweak warn threshold." into mnc-dev
Jeff Sharkey [Thu, 30 Jul 2015 19:24:53 +0000 (19:24 +0000)]
Merge "Refresh after clearing, tweak warn threshold." into mnc-dev

8 years agoRefresh after clearing, tweak warn threshold.
Jeff Sharkey [Thu, 30 Jul 2015 18:30:13 +0000 (11:30 -0700)]
Refresh after clearing, tweak warn threshold.

Refresh UI after clearing cache.  Hide user header on single-user
devices to match UX spec.  Refine adopted storage warning threshold
based on experiments with various devices.

For example, a typical internal storage device runs the benchmark
in about 600ms.  Very fast SD cards take about 1700ms, moderate speed
SD cards take about 3800ms, and slow SD cards take about 6800ms.

Bug: 2234590222487370
Change-Id: I6066f3b78dbb32277ae94b79e325500724f83c7e