OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoam 1042f538: (-s ours) am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import...
Geoff Mendal [Wed, 19 Aug 2015 14:31:29 +0000 (14:31 +0000)]
am 1042f538: (-s ours) am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '1042f538a2769fcd6e70453660872a7a9ca8dc74':
  Import translations. DO NOT MERGE

8 years agoam 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 19 Aug 2015 14:20:55 +0000 (14:20 +0000)]
am 9c989954: (-s ours) am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '9c98995468e530f8c0d925ce3b5285756930224e':
  Import translations. DO NOT MERGE

8 years agoam 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 19 Aug 2015 14:20:31 +0000 (14:20 +0000)]
am 22ab07ea: am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit '22ab07ea8fbb44eb9f461d0fb31431e05d6671ad':
  Stop crash on repeated enters on virtual keyboard

8 years agoam a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:15:27 +0000 (14:15 +0000)]
am a206a162: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

8 years agoam f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 19 Aug 2015 14:15:07 +0000 (14:15 +0000)]
am f7f0a85f: am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit 'f7f0a85fe6c7d68a127f42e3528ef81050f8dd0c':
  Stop crash on repeated enters on virtual keyboard

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 19 Aug 2015 14:09:16 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

8 years agoam 1f8fb0f8: Stop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 19 Aug 2015 14:08:36 +0000 (14:08 +0000)]
am 1f8fb0f8: Stop crash on repeated enters on virtual keyboard

* commit '1f8fb0f8ce1e82266a3a12b3d31b9062cff3fc44':
  Stop crash on repeated enters on virtual keyboard

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Aug 2015 14:08:00 +0000 (07:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import

8 years agoStop crash on repeated enters on virtual keyboard
Paul Lawrence [Wed, 12 Aug 2015 20:49:34 +0000 (13:49 -0700)]
Stop crash on repeated enters on virtual keyboard

Change https://googleplex-android-review.git.corp.google.com/#/c/742462/
removed the mDone since graying out the button seemed to remove the need
for this. However, you can also enter this command repeatedly from the
soft keyboard.

Put mDone back.

Bug: 23181625
Change-Id: I42e8ecb9824b17825778c9c113130506cc3a200b

8 years agoam 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details...
Julia Reynolds [Mon, 17 Aug 2015 17:47:29 +0000 (17:47 +0000)]
am 904a7e96: am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.

* commit '904a7e96a9c8023cd4a24c73a5f77659b48f04d8':
  String update for battery details page.

8 years agoam db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:39:38 +0000 (17:39 +0000)]
am db4a029f: am 62fdd558: am 0ece6a32: String update for battery details page.

* commit 'db4a029f66092ee8497775e434c21fee7dbda486':
  String update for battery details page.

8 years agoam 62fdd558: am 0ece6a32: String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:32:26 +0000 (17:32 +0000)]
am 62fdd558: am 0ece6a32: String update for battery details page.

* commit '62fdd5581e131731651e4afb96bedd8092ffd9cc':
  String update for battery details page.

8 years agoam 0ece6a32: String update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:26:19 +0000 (17:26 +0000)]
am 0ece6a32: String update for battery details page.

* commit '0ece6a3241062842db991ad63add899369ce1853':
  String update for battery details page.

8 years agoString update for battery details page.
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.

Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90

8 years agoam a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into...
Chris Wren [Mon, 17 Aug 2015 17:09:47 +0000 (17:09 +0000)]
am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit 'a18e6ffe9a3c53daa57d622965f594b56dd559a5':
  instrument fingerprint settings

8 years agoam 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 17:01:58 +0000 (17:01 +0000)]
am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit '8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
  instrument fingerprint settings

8 years agoam 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:52:25 +0000 (16:52 +0000)]
am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit '15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
  instrument fingerprint settings

8 years agoMerge "instrument fingerprint settings" into mnc-dr-dev
Chris Wren [Mon, 17 Aug 2015 16:47:56 +0000 (16:47 +0000)]
Merge "instrument fingerprint settings" into mnc-dr-dev

8 years agoam 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:49:39 +0000 (15:49 +0000)]
am 51ba8b47: am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '51ba8b47f501d5fe5915a997507aba2fc246012e':
  Fix Usb-C dialog issues

8 years agoam 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:41:16 +0000 (15:41 +0000)]
am 99df2376: am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '99df2376a161d1a1328b64dfd2451aeb2c50e532':
  Fix Usb-C dialog issues

8 years agoam 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:35:45 +0000 (15:35 +0000)]
am 9d59a244: Merge "Fix Usb-C dialog issues" into mnc-dr-dev

* commit '9d59a2441ee59b0fe74f49cb12de3af2cab89da1':
  Fix Usb-C dialog issues

8 years agoMerge "Fix Usb-C dialog issues" into mnc-dr-dev
Jason Monk [Mon, 17 Aug 2015 15:29:52 +0000 (15:29 +0000)]
Merge "Fix Usb-C dialog issues" into mnc-dr-dev

8 years agoam f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translati...
Geoff Mendal [Mon, 17 Aug 2015 14:27:25 +0000 (14:27 +0000)]
am f1ad264c: (-s ours) am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 14:19:03 +0000 (14:19 +0000)]
am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE

* commit '7533cd473df2acf79c874f40123865d554434b90':
  Import translations. DO NOT MERGE

8 years agoam 3c274207: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 14:12:28 +0000 (14:12 +0000)]
am 3c274207: (-s ours) Import translations. DO NOT MERGE

* commit '3c27420773e35c753e9d4f0114886a68da953469':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Aug 2015 14:05:00 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import

8 years agoam b5ca40c6: am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalesci...
Adam Lesinski [Fri, 14 Aug 2015 20:01:51 +0000 (20:01 +0000)]
am b5ca40c6: am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev

* commit 'b5ca40c6442c4f30b79dcd202bb9fecc65ba436c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs

8 years agoam 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared...
Adam Lesinski [Fri, 14 Aug 2015 19:55:05 +0000 (19:55 +0000)]
am 11d1caed: am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev

* commit '11d1caede255fe9643692974031fb93448adbd97':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs

8 years agoam e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs...
Adam Lesinski [Fri, 14 Aug 2015 19:47:43 +0000 (19:47 +0000)]
am e3ddd117: am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev

* commit 'e3ddd117a6bd6f25ea345349fe59be6a4ada3161':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs

8 years agoinstrument fingerprint settings
Chris Wren [Fri, 14 Aug 2015 19:42:02 +0000 (15:42 -0400)]
instrument fingerprint settings

  instrument visibility on all fingerprint views
  rename and delete action
  add fingerprint action is implicit in flow

Bug: 22951001
Change-Id: I53f048f479e24754972b801598d5da393ba9d716

8 years agoam 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs...
Adam Lesinski [Fri, 14 Aug 2015 19:43:40 +0000 (19:43 +0000)]
am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev

* commit '3cc05c9d7e290b7e6ff10c3428c471b8e2529f2c':
  BatteryStats: Fix coalescing of shared app GIDs and system UIDs

8 years agoMerge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
Adam Lesinski [Fri, 14 Aug 2015 19:38:34 +0000 (19:38 +0000)]
Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev

8 years agoam b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration betwe...
Jeff Sharkey [Fri, 14 Aug 2015 18:47:12 +0000 (18:47 +0000)]
am b38493cc: am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev

* commit 'b38493cc6c52346edbcb045a67b1f4831a80290e':
  Only offer migration between private volumes.

8 years agoam b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private...
Jeff Sharkey [Fri, 14 Aug 2015 18:40:03 +0000 (18:40 +0000)]
am b0f9e9d4: am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev

* commit 'b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
  Only offer migration between private volumes.

8 years agoam 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into...
Jeff Sharkey [Fri, 14 Aug 2015 18:34:36 +0000 (18:34 +0000)]
am 82fee7bd: am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev

* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.

8 years agoam b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:29:15 +0000 (18:29 +0000)]
am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev

* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.

8 years agoMerge "Only offer migration between private volumes." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev

8 years agoam 95a3e220: am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time"...
Chris Tate [Fri, 14 Aug 2015 17:41:11 +0000 (17:41 +0000)]
am 95a3e220: am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '95a3e2200c8e2662999bf2453ca8312d6c5312c0':
  Make "Ask every time" actually work that way

8 years agoam 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work...
Chris Tate [Fri, 14 Aug 2015 17:35:13 +0000 (17:35 +0000)]
am 7c8cb46f: am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '7c8cb46fe383956830a04e079a13ded56f7c2154':
  Make "Ask every time" actually work that way

8 years agoam 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into...
Chris Tate [Fri, 14 Aug 2015 17:27:02 +0000 (17:27 +0000)]
am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
  Make "Ask every time" actually work that way

8 years agoam 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:20:18 +0000 (17:20 +0000)]
am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
  Make "Ask every time" actually work that way

8 years agoMerge "Make "Ask every time" actually work that way" into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev

8 years agoOnly offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 16:46:03 +0000 (09:46 -0700)]
Only offer migration between private volumes.

Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.

Bug: 22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e

8 years agoBatteryStats: Fix coalescing of shared app GIDs and system UIDs
Adam Lesinski [Thu, 13 Aug 2015 23:56:30 +0000 (16:56 -0700)]
BatteryStats: Fix coalescing of shared app GIDs and system UIDs

UIDs that consumed power and were actually shared app GIDs are now
coelsced for system apps as well as regular applications. In addition,
system UIDs like logd, NFC, DRM, etc are coalesced into Android System.

Bug:23189342
Change-Id: I6c8eb4baec66fba3d1f71a155d8ea1fe920ffec9

8 years agoam ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog...
Jeff Sharkey [Fri, 14 Aug 2015 03:18:55 +0000 (03:18 +0000)]
am ffe642ed: am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev

* commit 'ffe642ed030277d2e065b6ad55596c35b1daff39':
  Show storage slow dialog allowing state loss.

8 years agoam fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state...
Jeff Sharkey [Fri, 14 Aug 2015 01:37:59 +0000 (01:37 +0000)]
am fa620435: am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev

* commit 'fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1':
  Show storage slow dialog allowing state loss.

8 years agoam c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into...
Jeff Sharkey [Fri, 14 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am c73287b9: am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev

* commit 'c73287b9dbfe63ddde24ac1e0975f50382f24e71':
  Show storage slow dialog allowing state loss.

8 years agoam ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 01:24:41 +0000 (01:24 +0000)]
am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev

* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
  Show storage slow dialog allowing state loss.

8 years agoMerge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev

8 years agoShow storage slow dialog allowing state loss.
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.

We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.

Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.

Bug: 22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d

8 years agoMake "Ask every time" actually work that way
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way

..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307

8 years agoam b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22...
Geoff Mendal [Thu, 13 Aug 2015 06:43:03 +0000 (06:43 +0000)]
am b3852044: (-s ours) am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translati...
Geoff Mendal [Thu, 13 Aug 2015 05:09:45 +0000 (05:09 +0000)]
am 93d1612d: (-s ours) am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE

* commit '93d1612d160f3e71c6dead490a36a334f6abb25f':
  Import translations. DO NOT MERGE

8 years agoam 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 05:04:41 +0000 (05:04 +0000)]
am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam eea96f22: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)]
am eea96f22: (-s ours) Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e

8 years agoam 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints...
Jorim Jaggi [Thu, 13 Aug 2015 01:42:13 +0000 (01:42 +0000)]
am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev

* commit '0cae8ad78170d56beaafcb18015e25421895ac50':
  Wait with finishing until fingerprints are removed

8 years agoam e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed...
Jorim Jaggi [Thu, 13 Aug 2015 01:35:51 +0000 (01:35 +0000)]
am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev

* commit 'e9639b1d0141ce25548105a17eab3e30b6341f1a':
  Wait with finishing until fingerprints are removed

8 years agoam 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc...
Jorim Jaggi [Thu, 13 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev

* commit '5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
  Wait with finishing until fingerprints are removed

8 years agoam cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Inclu...
Dianne Hackborn [Thu, 13 Aug 2015 01:18:08 +0000 (01:18 +0000)]
am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
  Fix issue #23116383: Include security patch level in Settings

8 years agoMerge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
Jorim Jaggi [Thu, 13 Aug 2015 01:18:03 +0000 (01:18 +0000)]
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev

8 years agoWait with finishing until fingerprints are removed
Jorim Jaggi [Tue, 11 Aug 2015 01:11:07 +0000 (18:11 -0700)]
Wait with finishing until fingerprints are removed

Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377

8 years agoam 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security...
Dianne Hackborn [Thu, 13 Aug 2015 01:09:10 +0000 (01:09 +0000)]
am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '2be290cf36f06da260e67b430a625422da512609':
  Fix issue #23116383: Include security patch level in Settings

8 years agoam 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level...
Dianne Hackborn [Thu, 13 Aug 2015 01:02:23 +0000 (01:02 +0000)]
am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
  Fix issue #23116383: Include security patch level in Settings

8 years agoam f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings...
Dianne Hackborn [Thu, 13 Aug 2015 00:54:31 +0000 (00:54 +0000)]
am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
  Fix issue #23116383: Include security patch level in Settings

8 years agoMerge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

8 years agoFix issue #23116383: Include security patch level in Settings
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #23116383: Include security patch level in Settings

Change-Id: I003564376a02a70f0245353472544cde355240ac

8 years agoFix Usb-C dialog issues
Jason Monk [Wed, 12 Aug 2015 18:14:33 +0000 (14:14 -0400)]
Fix Usb-C dialog issues

 - Fix theme
 - Fix PTP bug introduced in initial USB-C support

Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e

8 years agoam 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP...
Sanket Padawe [Wed, 12 Aug 2015 18:03:56 +0000 (18:03 +0000)]
am 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

* commit '8d425a526b383c1e0c2d60fd3c27f7a5dd5e5e2f':
  Avoid sending identity along with EAP sim, aka & aka'.

8 years agoam d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka ...
Sanket Padawe [Wed, 12 Aug 2015 17:50:54 +0000 (17:50 +0000)]
am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

* commit 'd0513282f81d8218eb0fef93a7316a6699d087f7':
  Avoid sending identity along with EAP sim, aka & aka'.

8 years agoam 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into...
Sanket Padawe [Wed, 12 Aug 2015 17:34:42 +0000 (17:34 +0000)]
am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

* commit '1d29bde1f5369b5cb5b24adbad662ef33524f4e2':
  Avoid sending identity along with EAP sim, aka & aka'.

8 years agoMerge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
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

8 years agoam ce821387: (-s ours) am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translati...
Geoff Mendal [Wed, 12 Aug 2015 14:18:59 +0000 (14:18 +0000)]
am ce821387: (-s ours) am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

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

8 years agoam 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:11:11 +0000 (14:11 +0000)]
am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

* commit '699ef29e9fcf59eb1023c767cceab4de4f64ae13':
  Import translations. DO NOT MERGE

8 years agoam 42ae7fba: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:06:27 +0000 (14:06 +0000)]
am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

* commit '42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9':
  Import translations. DO NOT MERGE

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

8 years agoAvoid sending identity along with EAP sim, aka & aka'.
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

8 years agoam f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use corre...
Andres Morales [Tue, 11 Aug 2015 23:56:36 +0000 (23:56 +0000)]
am f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit 'f1808dcafc45fea92e27b5300f4d6cc742bb3105':
  [ConfirmPattern] use correct user id for stealth mode

8 years agoam 0f440a70: am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Descr...
Dianne Hackborn [Tue, 11 Aug 2015 23:56:35 +0000 (23:56 +0000)]
am 0f440a70: am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '0f440a701cc32fab7a522fe677ee4c280ca648f8':
  Fix issue #23079119: Description for write settings permission says...

8 years agoam e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id...
Andres Morales [Tue, 11 Aug 2015 23:48:50 +0000 (23:48 +0000)]
am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit 'e5d646841d62484939c660e078c712866c64f244':
  [ConfirmPattern] use correct user id for stealth mode

8 years agoam 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for...
Dianne Hackborn [Tue, 11 Aug 2015 23:48:49 +0000 (23:48 +0000)]
am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
  Fix issue #23079119: Description for write settings permission says...

8 years agoam a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth...
Andres Morales [Tue, 11 Aug 2015 23:43:51 +0000 (23:43 +0000)]
am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit 'a7bdde58856c7cf776cb326b7a1a9c58d649b3f8':
  [ConfirmPattern] use correct user id for stealth mode

8 years agoam e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings...
Dianne Hackborn [Tue, 11 Aug 2015 23:39:23 +0000 (23:39 +0000)]
am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit 'e2e76435f4a0604d751b32838409421b072ca25d':
  Fix issue #23079119: Description for write settings permission says...

8 years agoam 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
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

8 years agoam d2174636: am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use differen...
Maurice Lam [Tue, 11 Aug 2015 23:32:26 +0000 (23:32 +0000)]
am d2174636: am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit 'd2174636293e52d4df01f191787df62e96e994d3':
  [Fingerprint] Use different ring size for setup

8 years agoMerge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
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

8 years agoam 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size...
Maurice Lam [Tue, 11 Aug 2015 23:27:00 +0000 (23:27 +0000)]
am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit '4797364d8ac175b3322f7adcb5963602f2bb18d0':
  [Fingerprint] Use different ring size for setup

8 years agoam 8500822b: Merge "Fix issue #23079119: Description for write settings permission...
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...

8 years agoMerge "Fix issue #23079119: Description for write settings permission says..." into...
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

8 years ago[ConfirmPattern] use correct user id for stealth mode
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

8 years agoam a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup...
Maurice Lam [Tue, 11 Aug 2015 23:15:33 +0000 (23:15 +0000)]
am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit 'a430ac56b22da424abeda82ca074ef19d5e9cd56':
  [Fingerprint] Use different ring size for setup

8 years agoam a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern...
Paul Lawrence [Tue, 11 Aug 2015 23:03:18 +0000 (23:03 +0000)]
am a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit 'a66240fd94cb458cb1e938419abad676b8132ca5':
  Gray out confirm button on pattern/pin/password set dialog

8 years agoam 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
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

8 years agoMerge "[Fingerprint] Use different ring size for setup" into mnc-dev
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

8 years agoam 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password...
Paul Lawrence [Tue, 11 Aug 2015 22:35:26 +0000 (22:35 +0000)]
am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit '550f66edfe5ebafde3afc3ba3fd7e4160373df36':
  Gray out confirm button on pattern/pin/password set dialog

8 years agoam 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into...
Paul Lawrence [Tue, 11 Aug 2015 22:25:31 +0000 (22:25 +0000)]
am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit '68f79718f7c4f648533e1ecd7f66d0b30f161b64':
  Gray out confirm button on pattern/pin/password set dialog

8 years agoMerge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-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

8 years agoGray out confirm button on pattern/pin/password set dialog
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

8 years agoFix issue #23079119: Description for write settings permission says...
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

8 years agoam 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture...
Jason Monk [Tue, 11 Aug 2015 14:12:00 +0000 (14:12 +0000)]
am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '31227bfaf12ede192474bb162f1555215ffa605b':
  Add setting to disable camera gesture