OSDN Git Service
Zach Jang [Mon, 21 Sep 2015 21:37:14 +0000 (21:37 +0000)]
am
2ead0934: am
386c7763: (-s ours) am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
2ead093496c3b5b266c21a483c4f0c37869d57de':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:30:06 +0000 (21:30 +0000)]
am
386c7763: (-s ours) am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
386c7763eb8cd3e856a26fe3cbd39cc573978c29':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 21:06:13 +0000 (21:06 +0000)]
am
564ec935: am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
564ec9357bac62d571ba8ba9d58957477b8b5209':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 19:05:36 +0000 (19:05 +0000)]
am
00721b4a: am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
00721b4afa3940138e82cd150bb6670239ec0b5b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Zach Jang [Mon, 21 Sep 2015 18:58:12 +0000 (18:58 +0000)]
am
c87ceb7e: am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Baligh Uddin [Sat, 19 Sep 2015 02:35:07 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Paul Lawrence [Sat, 19 Sep 2015 02:32:23 +0000 (02:32 +0000)]
Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev
Paul Lawrence [Sat, 19 Sep 2015 02:29:37 +0000 (02:29 +0000)]
Revert "Remove don't kill flag from CryptKeeper to stop logspam"
This reverts commit
4f60679b7608aba38142bfee472c4722aebf056f.
Change-Id: I8c1ebef08f9b5cef4e4c31187a8ba80306afc840
Jim Miller [Sat, 19 Sep 2015 00:59:51 +0000 (00:59 +0000)]
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
Justin Harrison [Sat, 19 Sep 2015 00:21:45 +0000 (00:21 +0000)]
Merge "Add color transform setting" into mnc-dr-dev
Jason Monk [Fri, 18 Sep 2015 20:16:52 +0000 (16:16 -0400)]
Add color transform setting
Bug:
24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
Jim Miller [Fri, 18 Sep 2015 21:59:54 +0000 (14:59 -0700)]
Add summary for 0 fingerprint settings preference
This allows the fingerprint summary to be shown when there
are no fingerprints.
Fixes bug
24172006
Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
Adam Lesinski [Fri, 18 Sep 2015 20:26:06 +0000 (20:26 +0000)]
Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
Baligh Uddin [Fri, 18 Sep 2015 17:37:08 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
Paul Lawrence [Fri, 18 Sep 2015 15:26:01 +0000 (15:26 +0000)]
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
Paul Lawrence [Fri, 18 Sep 2015 14:31:11 +0000 (14:31 +0000)]
Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
Zach Jang [Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)]
am
6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '
6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
Paul Lawrence [Wed, 16 Sep 2015 22:29:57 +0000 (15:29 -0700)]
Stop long passwords crashing CryptKeeper
Bug:
24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
Baligh Uddin [Tue, 15 Sep 2015 14:12:42 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Hyejin [Fri, 11 Sep 2015 06:26:53 +0000 (23:26 -0700)]
Fix IndexOutOfBoundsException while silent provisioning check
- If hostpot off, we receive result through HotspotOffReceiver.
Sometimes, during provisioning, we're used to receive this.
In this case, we don't care.
After provisioning, we'll receive the intent again.
- In stress test,
index is sometimes invalid, equals to mCurrentTethers.size().
So, when provisioning, We check whether index is valid or not.
BUG=
23528220
Change-Id: I70f35e045042c6c81b1db03e2a44cd41d3e7437f
Paul Lawrence [Mon, 14 Sep 2015 21:55:57 +0000 (14:55 -0700)]
Remove don't kill flag from CryptKeeper to stop logspam
Bug:
23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
Zach Jang [Mon, 14 Sep 2015 21:03:12 +0000 (14:03 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3
b/
23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
Baligh Uddin [Mon, 14 Sep 2015 10:20:45 +0000 (03:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
Selim Cinek [Sat, 12 Sep 2015 00:28:09 +0000 (00:28 +0000)]
Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
Selim Cinek [Sat, 12 Sep 2015 00:06:29 +0000 (17:06 -0700)]
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
When rotating the ConfirmDeviceCredentials Activity, it was launched again after
solving the challenge.
Bug:
23937676
Change-Id: Ic0852448f498c79d5448c72cbc31bb55d9bfeddb
Jorim Jaggi [Fri, 11 Sep 2015 22:14:06 +0000 (22:14 +0000)]
Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
Jorim Jaggi [Fri, 11 Sep 2015 22:13:21 +0000 (22:13 +0000)]
Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
Jorim Jaggi [Fri, 11 Sep 2015 04:24:22 +0000 (21:24 -0700)]
Add timeout if we dont get onEnterAnimationComplete
Window manager doesn't send us onEnterAnimationComplete in the case
where there are two activites starting at the same time and the
screen orientation is changing. Add a timeout to work around this
until we have a proper fix.
Bug:
23849216
Change-Id: I4be7787d1bc13f8cb0ffd892010c4b5c0142c783
Baligh Uddin [Fri, 11 Sep 2015 16:24:21 +0000 (16:24 +0000)]
am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
1538dde4fbb00617bfd1d51f958f32ba4d68ff12':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:19:17 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Jorim Jaggi [Fri, 11 Sep 2015 03:12:19 +0000 (20:12 -0700)]
Finish trampoline activity for ConfirmDeviceCredential immediately
Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.
Bug:
23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
Jorim Jaggi [Fri, 11 Sep 2015 01:58:55 +0000 (01:58 +0000)]
Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
Baligh Uddin [Thu, 10 Sep 2015 21:56:41 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
Baligh Uddin [Thu, 10 Sep 2015 21:53:10 +0000 (14:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5
Auto-generated-cl: translation import
Jorim Jaggi [Thu, 10 Sep 2015 20:35:04 +0000 (13:35 -0700)]
Fix crash in when restoring CredentialCheckResultTracker Fragment
Bug:
23956504
Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
Jason Monk [Thu, 10 Sep 2015 14:36:58 +0000 (10:36 -0400)]
Include the usb data mode regardless of data role
Turns out there are valid data modes in host mode (like midi).
Need to allow these through for the dialog to set the proper
current state.
Bug:
23905770
Change-Id: I7a37ad95ccaf18f211d2b2d330c7f1d7af4cfc16
Jorim Jaggi [Thu, 10 Sep 2015 00:25:59 +0000 (00:25 +0000)]
Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
Jim Miller [Wed, 9 Sep 2015 22:53:53 +0000 (22:53 +0000)]
Merge "Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again." into mnc-dr-dev
Jorim Jaggi [Tue, 8 Sep 2015 21:56:40 +0000 (14:56 -0700)]
Add double-tap power button to open camera 2/2
Bug:
23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
Jim Miller [Wed, 2 Sep 2015 21:00:50 +0000 (14:00 -0700)]
Handle fp enrollment errors more gracefully
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.
Fixes bug
23546104
Fixes bug
22708384
Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
Sungmin Choi [Fri, 28 Aug 2015 23:56:31 +0000 (16:56 -0700)]
Hide or show APNs with type="ims" as CarrierConfig
APN with type="ims" is used to attach IMS APN to the modem.
This APN is meaningless and confusing to end users.
Most carriers don't care to show this APN from apn list.
Some carriers want to show this APN from apn list and others don't.
This change hides or shows this as CarrierConfig from the APN list.
Bug:
23770219
Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
Jorim Jaggi [Tue, 8 Sep 2015 21:40:27 +0000 (14:40 -0700)]
Fix build
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
Jorim Jaggi [Fri, 4 Sep 2015 18:42:28 +0000 (11:42 -0700)]
Fix crash in fingerprint settings when rotating
Fragments always need empty constructors.
Bug:
23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
Geoff Mendal [Mon, 7 Sep 2015 15:35:11 +0000 (08:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
Adam Lesinski [Sun, 6 Sep 2015 08:57:58 +0000 (01:57 -0700)]
Update implementation to match BatteryStats.Uid
Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
Jason Monk [Thu, 3 Sep 2015 17:51:09 +0000 (17:51 +0000)]
Merge "Start tether service with redeliver intent" into mnc-dr-dev
Jason Monk [Thu, 3 Sep 2015 16:48:25 +0000 (12:48 -0400)]
Start tether service with redeliver intent
So that the intent comes back when we are restarted rather than
null causing a crash.
Bug:
23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
Jorim Jaggi [Thu, 3 Sep 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Fix fingerprint settings ripples" into mnc-dr-dev
Jorim Jaggi [Thu, 3 Sep 2015 00:24:55 +0000 (17:24 -0700)]
Fix fingerprint settings ripples
Bug:
22471044
Bug:
23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
Maurice Lam [Wed, 2 Sep 2015 23:35:15 +0000 (23:35 +0000)]
Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
Maurice Lam [Wed, 2 Sep 2015 21:36:19 +0000 (14:36 -0700)]
[Fingerprint] Update strings for skip dialog
Bug:
23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
Sungmin Choi [Fri, 31 Jul 2015 09:03:52 +0000 (02:03 -0700)]
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
Geoff Mendal [Wed, 2 Sep 2015 14:05:31 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
Xiyuan Xia [Tue, 1 Sep 2015 20:29:41 +0000 (20:29 +0000)]
Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
Jason Monk [Tue, 1 Sep 2015 19:02:44 +0000 (19:02 +0000)]
Merge "Protect against multiple provision responses" into mnc-dr-dev
Xiyuan Xia [Tue, 1 Sep 2015 18:46:19 +0000 (18:46 +0000)]
Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
Xiyuan Xia [Tue, 1 Sep 2015 18:29:36 +0000 (11:29 -0700)]
Fix wrong stage exception in ChooseLockPattern
ChooseLockPattern should updateStage instead of always enabling
pattern view input.
Bug:
22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
Jason Monk [Tue, 1 Sep 2015 17:20:55 +0000 (13:20 -0400)]
Protect against multiple provision responses
Bug:
23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
Xiyuan Xia [Mon, 31 Aug 2015 18:59:46 +0000 (11:59 -0700)]
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
Geoff Mendal [Mon, 31 Aug 2015 14:07:58 +0000 (07:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
Geoff Mendal [Sat, 29 Aug 2015 15:38:50 +0000 (08:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
Maurice Lam [Fri, 28 Aug 2015 22:13:19 +0000 (22:13 +0000)]
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
Maurice Lam [Fri, 28 Aug 2015 04:28:23 +0000 (21:28 -0700)]
[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
Geoff Mendal [Fri, 28 Aug 2015 10:14:49 +0000 (10:14 +0000)]
am
37dfaa13: (-s ours) Import translations. DO NOT MERGE
* commit '
37dfaa13ec6882720ca100ef235a7649046aec12':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 28 Aug 2015 10:06:04 +0000 (03:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23544168
Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
Geoff Mendal [Fri, 28 Aug 2015 10:02:07 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23544168
Change-Id: I39c268e990f8cbb57fef7cec1a9a36ddac45f968
Xiyuan Xia [Fri, 28 Aug 2015 01:46:57 +0000 (01:46 +0000)]
Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
Xiyuan Xia [Tue, 25 Aug 2015 22:04:57 +0000 (15:04 -0700)]
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
Geoff Mendal [Wed, 26 Aug 2015 14:12:08 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
Jim Miller [Tue, 25 Aug 2015 23:08:55 +0000 (23:08 +0000)]
Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev
Sanket Padawe [Mon, 24 Aug 2015 17:59:07 +0000 (17:59 +0000)]
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.
Sanket Padawe [Mon, 24 Aug 2015 17:52:51 +0000 (17:52 +0000)]
Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
Geoff Mendal [Mon, 24 Aug 2015 14:16:24 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
Jim Miller [Sat, 22 Aug 2015 01:07:50 +0000 (18:07 -0700)]
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
Sanket Padawe [Fri, 21 Aug 2015 23:45:30 +0000 (16:45 -0700)]
Avoid new network to connect by using "Add Network" instead only Save it.
Bug:
23422433
Change-Id: I49aabff91ba127bf2a3b0aa25c8163ee4097bf4d
Christopher Tate [Fri, 21 Aug 2015 19:26:07 +0000 (19:26 +0000)]
am
ffe701dc: Present the security patch date in a human-friendly format
* commit '
ffe701dc0e52ee95bf6c54291ed1b574d389019c':
Present the security patch date in a human-friendly format
Christopher Tate [Thu, 20 Aug 2015 23:38:37 +0000 (16:38 -0700)]
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
Selim Cinek [Thu, 20 Aug 2015 19:04:30 +0000 (19:04 +0000)]
am
19551115: Adapted string length translation limits
* commit '
19551115dbb3d848be084462342d41addeb1caf6':
Adapted string length translation limits
Selim Cinek [Thu, 20 Aug 2015 18:53:47 +0000 (11:53 -0700)]
Adapted string length translation limits
Bug:
23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
Maurice Lam [Wed, 19 Aug 2015 23:51:30 +0000 (23:51 +0000)]
Merge "[Fingerprint] Smaller enrolling ring" 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
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
Maurice Lam [Wed, 19 Aug 2015 01:30:36 +0000 (18:30 -0700)]
[Fingerprint] Smaller enrolling ring
Make the enrolling progress ring smaller in sw400dp during setup.
Bug:
23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
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
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.
Julia Reynolds [Mon, 17 Aug 2015 17:14:38 +0000 (13:14 -0400)]
String update for battery details page.
Bug:
22978210
Change-Id: I87d231868d6116c3f0d88a6a6d3ca5fac1ce8c90
Chris Wren [Mon, 17 Aug 2015 16:47:56 +0000 (16:47 +0000)]
Merge "instrument fingerprint settings" 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
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
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
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
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
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.
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." 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
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
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
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
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.
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev