Commit Graph

8861 Commits

Author SHA1 Message Date
Jorim Jaggi
c624a72be1 Merge "Fix fingerprint settings ripples" into mnc-dr-dev 2015-09-03 01:19:28 +00:00
Jorim Jaggi
1e2433693a Fix fingerprint settings ripples
Bug: 22471044
Bug: 23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
2015-09-02 17:42:29 -07:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
2015-09-02 14:36:19 -07:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.

Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
2015-09-02 13:51:44 -07:00
Xiyuan Xia
50e1f59a68 Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev 2015-09-01 20:29:41 +00:00
Jason Monk
65b0666d36 Merge "Protect against multiple provision responses" into mnc-dr-dev 2015-09-01 19:02:44 +00:00
Xiyuan Xia
a104c05da9 Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev 2015-09-01 18:46:19 +00:00
Xiyuan Xia
e47a2ab83e Fix wrong stage exception in ChooseLockPattern
ChooseLockPattern should updateStage instead of always enabling
pattern view input.

Bug:22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
2015-09-01 11:29:36 -07:00
Jason Monk
359170f4b0 Protect against multiple provision responses
Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
2015-09-01 13:20:55 -04:00
Xiyuan Xia
00b17fa3c3 Fix races in ConfirmPassword/Pattern
- Add a CheckLockResultTracker to track result of async lock check so that
  it can finish on configuration change;
- Let the pending lock check finish and ignore subsequent check requests;
- Add a mDisappearing flag to prevent running disappear animation
  multiple times;
- Check whether activity is still active after disappear animation
  before setting result and finishing it;
- Remove no longer used mNumWrongConfirmAttempts;

Bug:23190499
Change-Id: If1784d3d1fcc152ac06137b12748b9def5726692
2015-08-31 15:25:31 -07:00
Maurice Lam
3087a4e0fd Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 2015-08-28 22:13:19 +00:00
Maurice Lam
48cf33a94e [Fingerprint] Add skip dialog during SUW
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.

Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Xiyuan Xia
43fe6dba69 Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev 2015-08-28 01:46:57 +00:00
Xiyuan Xia
3e7e3d6c59 Fix ChoosePat/Pin/Pwd crash from async task
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.

Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
2015-08-27 13:35:55 -07:00
Jim Miller
f7fc642987 Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev 2015-08-25 23:08:55 +00:00
Sanket Padawe
1a9626f056 am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
* commit '3be6d0b44bf1152be0bc11bf6bacf750e1028b49':
  Avoid new network to connect by using "Add Network" instead only Save it.
2015-08-24 17:59:07 +00:00
Sanket Padawe
3be6d0b44b Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev 2015-08-24 17:52:51 +00:00
Jim Miller
c2f6813a83 Don't attempt to remove fp templates if none are enrolled
The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.

Fixes bug 23183484

Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300
2015-08-21 18:07:50 -07:00
Sanket Padawe
e0ece963c6 Avoid new network to connect by using "Add Network" instead only Save it.
Bug: 23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
2015-08-21 16:45:30 -07:00
Christopher Tate
5d187aa43d am ffe701dc: Present the security patch date in a human-friendly format
* commit 'ffe701dc0e52ee95bf6c54291ed1b574d389019c':
  Present the security patch date in a human-friendly format
2015-08-21 19:26:07 +00:00
Christopher Tate
ffe701dc0e Present the security patch date in a human-friendly format
For example, for an ISO date of 2015-08-01, this now displays
"August 1, 2015" in enUS, and "1 August 2015" in enUK, and
"2015年8月1日" in jpJP.

Bug 23358065

Change-Id: Iaa920ec88d765a222f0b589123665b689bf41978
2015-08-20 17:16:08 -07:00
Paul Lawrence
1f8fb0f8ce 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
2015-08-18 16:25:00 +00:00
Julia Reynolds
62fdd5581e am 0ece6a32: String update for battery details page.
* commit '0ece6a3241062842db991ad63add899369ce1853':
  String update for battery details page.
2015-08-17 17:26:19 +00:00
Julia Reynolds
0ece6a3241 String update for battery details page.
Bug: 22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
2015-08-17 13:14:38 -04:00
Chris Wren
15ff8af7a7 Merge "instrument fingerprint settings" into mnc-dr-dev 2015-08-17 16:47:56 +00:00
Jason Monk
9d59a2441e Merge "Fix Usb-C dialog issues" into mnc-dr-dev 2015-08-17 15:29:52 +00:00
Chris Wren
1b8d5ffb47 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
2015-08-14 15:44:16 -04:00
Adam Lesinski
e3ddd117a6 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
2015-08-14 19:43:40 +00:00
Adam Lesinski
3cc05c9d7e Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev 2015-08-14 19:38:34 +00:00
Jeff Sharkey
82fee7bd0a am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.
2015-08-14 18:29:15 +00:00
Jeff Sharkey
b4158f0e15 Merge "Only offer migration between private volumes." into mnc-dev 2015-08-14 18:23:39 +00:00
Chris Tate
36e2d32dab am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
  Make "Ask every time" actually work that way
2015-08-14 17:20:18 +00:00
Chris Tate
7e36d33c00 Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:48 +00:00
Jeff Sharkey
6f52ed3332 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
2015-08-14 09:46:03 -07:00
Adam Lesinski
8f743471d5 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
2015-08-13 22:12:47 -07:00
Jeff Sharkey
c73287b9db am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit 'ae531f1f613fb1a94fade18e5e92fc842a2a9016':
  Show storage slow dialog allowing state loss.
2015-08-14 01:24:41 +00:00
Jeff Sharkey
ae531f1f61 Merge "Show storage slow dialog allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Jeff Sharkey
0814827e8f 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
2015-08-13 16:57:48 -07:00
Christopher Tate
970291e20c 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
2015-08-13 16:34:10 -07:00
Jorim Jaggi
5dd0e27fbb Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev 2015-08-13 01:18:03 +00:00
Jorim Jaggi
f92fbc1c49 Wait with finishing until fingerprints are removed
Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
2015-08-12 18:12:58 -07:00
Dianne Hackborn
6a1e1e08a0 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
2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9 Fix issue #23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
2015-08-12 16:11:46 -07:00
Jason Monk
94e460fd45 Fix Usb-C dialog issues
- Fix theme
 - Fix PTP bug introduced in initial USB-C support

Bug: 21615151
Change-Id: I577f06929b028fe3f50ef5b9adcfa9507fd1df0e
2015-08-12 14:14:33 -04:00
Sanket Padawe
1d29bde1f5 Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev 2015-08-12 17:17:31 +00:00
Sanket Padawe
f1165c14c5 Avoid sending identity along with EAP sim, aka & aka'.
Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
2015-08-11 18:42:36 -07:00
Andres Morales
a7bdde5885 am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
  [ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:35:59 +00:00
Andres Morales
b56324b149 [ConfirmPattern] use correct user id for stealth mode
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
2015-08-11 23:17:17 +00:00