OSDN Git Service
Paul Lawrence [Fri, 18 Sep 2015 14:58:04 +0000 (14:58 +0000)]
am
1ec8f89b: am
98e9c747: am
8d28491a: am
c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '
1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583':
Remove don't kill flag from CryptKeeper to stop logspam
Paul Lawrence [Fri, 18 Sep 2015 14:49:49 +0000 (14:49 +0000)]
am
98e9c747: am
8d28491a: am
c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '
98e9c7472ccb8f45220f73bf1c693f681681c00a':
Remove don't kill flag from CryptKeeper to stop logspam
Paul Lawrence [Fri, 18 Sep 2015 14:44:08 +0000 (14:44 +0000)]
am
8d28491a: am
c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '
8d28491a2f2d8ef8e2142171d290f46f381c8a76':
Remove don't kill flag from CryptKeeper to stop logspam
Paul Lawrence [Fri, 18 Sep 2015 14:37:01 +0000 (14:37 +0000)]
am
c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
* commit '
c2e73bbc06739cdd55f7baaca8ab1aa915ee6e83':
Remove don't kill flag from CryptKeeper to stop logspam
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
Baligh Uddin [Tue, 15 Sep 2015 14:37:45 +0000 (14:37 +0000)]
am
cdf9e483: (-s ours) am
e4c1dccd: (-s ours) am
6df1ad97: (-s ours) am
ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
cdf9e48335deed100505622a0e721a720b03838b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Sep 2015 14:32:12 +0000 (14:32 +0000)]
am
e4c1dccd: (-s ours) am
6df1ad97: (-s ours) am
ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
e4c1dccda9719c1432b28eea90fbb0381d99638c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Sep 2015 14:27:34 +0000 (14:27 +0000)]
am
6df1ad97: (-s ours) am
ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
6df1ad97c906e936255a9feee6631b1684b0fa09':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Sep 2015 14:20:20 +0000 (14:20 +0000)]
am
ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
ba98cc2c1463b33c383e8399eb7742aa50b5a027':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 15 Sep 2015 14:12:45 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 15 Sep 2015 14:12:42 +0000 (14:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Hyejin [Tue, 15 Sep 2015 00:49:17 +0000 (00:49 +0000)]
am
375633ae: am
1dcb1135: am
7e84e35f: am
5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
* commit '
375633aea2a5ba9b0fc3b099bead8bbfef6a4cf3':
Fix IndexOutOfBoundsException while silent provisioning check
Hyejin [Tue, 15 Sep 2015 00:45:21 +0000 (00:45 +0000)]
am
1dcb1135: am
7e84e35f: am
5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
* commit '
1dcb1135b8157977cd44c05768f422243d64df83':
Fix IndexOutOfBoundsException while silent provisioning check
Hyejin [Tue, 15 Sep 2015 00:37:16 +0000 (00:37 +0000)]
am
7e84e35f: am
5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
* commit '
7e84e35fb191c0967feb0352a39a3147ceb68a8b':
Fix IndexOutOfBoundsException while silent provisioning check
Hyejin [Tue, 15 Sep 2015 00:29:32 +0000 (00:29 +0000)]
am
5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
* commit '
5565b5cd7537e9360e6382507a45cf5e091a5108':
Fix IndexOutOfBoundsException while silent provisioning check
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
Maurice Lam [Thu, 27 Aug 2015 23:06:55 +0000 (16:06 -0700)]
[WifiSettings] Submit Wi-Fi dialog with enter key
Add a OnKeyListener for hardware keyboards and an
OnEditorActionListener for on-screen IMEs to submit the Wi-Fi dialog
with the currently entered information.
Before committing the action, check for whether the dialog is
submittable -- that is checking whether all necessary information has
been entered. If not the enter key behaves the same as it is before
the change.
Bug:
22211604
Change-Id: Idede4233a7385d3bcd8fd6614948270280536bf1
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
Baligh Uddin [Mon, 14 Sep 2015 09:48:18 +0000 (02:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80c5843b1be74f3b58aa812986ff04680f588b2c
Auto-generated-cl: translation import
Selim Cinek [Sat, 12 Sep 2015 05:07:53 +0000 (05:07 +0000)]
am
f19b9b6d: am
0fe43c9a: am
fc76ddd0: am
cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
* commit '
f19b9b6d88f87a12723b3bf52f8d03bb6a831e83':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
Jorim Jaggi [Sat, 12 Sep 2015 02:57:18 +0000 (02:57 +0000)]
am
fb5aa541: am
d59ce1f4: am
6f5bbc1b: am
5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
* commit '
fb5aa5418ce4c103d8b2aa500cc4351e4b141397':
Add timeout if we dont get onEnterAnimationComplete
Jorim Jaggi [Sat, 12 Sep 2015 02:57:17 +0000 (02:57 +0000)]
am
c350cd0f: am
97081aa9: am
c77839e0: am
aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
* commit '
c350cd0f87cb0c23e58159b8b75022fed5ce97d8':
Finish trampoline activity for ConfirmDeviceCredential immediately
Selim Cinek [Sat, 12 Sep 2015 00:56:55 +0000 (00:56 +0000)]
am
0fe43c9a: am
fc76ddd0: am
cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
* commit '
0fe43c9aec51d6389aa3e6943190a75a62b641be':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
Selim Cinek [Sat, 12 Sep 2015 00:47:34 +0000 (00:47 +0000)]
am
fc76ddd0: am
cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
* commit '
fc76ddd01e165e9641349cc721b294d62ce268e5':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
Selim Cinek [Sat, 12 Sep 2015 00:38:18 +0000 (00:38 +0000)]
am
cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
* commit '
cda53c5dc2c6a2c01dfd5db278a7899dd868da7d':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
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 23:30:43 +0000 (23:30 +0000)]
am
d59ce1f4: am
6f5bbc1b: am
5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
* commit '
d59ce1f4e33cdc87af960ed3b35d0cf39afc00ff':
Add timeout if we dont get onEnterAnimationComplete
Jorim Jaggi [Fri, 11 Sep 2015 23:30:42 +0000 (23:30 +0000)]
am
97081aa9: am
c77839e0: am
aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
* commit '
97081aa929ea239937923359904f32ffa26f5180':
Finish trampoline activity for ConfirmDeviceCredential immediately
Jorim Jaggi [Fri, 11 Sep 2015 23:22:17 +0000 (23:22 +0000)]
am
6f5bbc1b: am
5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
* commit '
6f5bbc1b1e73b3559e311ea2e59a2281b67f65ca':
Add timeout if we dont get onEnterAnimationComplete
Jorim Jaggi [Fri, 11 Sep 2015 23:22:16 +0000 (23:22 +0000)]
am
c77839e0: am
aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
* commit '
c77839e0e12aaa656a65d5c3ff6da33cb0a76d46':
Finish trampoline activity for ConfirmDeviceCredential immediately
Jorim Jaggi [Fri, 11 Sep 2015 22:33:38 +0000 (22:33 +0000)]
am
5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
* commit '
5bd836aac3b7602a4166bc836aaa33ccc7107d74':
Add timeout if we dont get onEnterAnimationComplete
Jorim Jaggi [Fri, 11 Sep 2015 22:33:37 +0000 (22:33 +0000)]
am
aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
* commit '
aee6e41e5188e8809d8439f05fdce311aa7171c8':
Finish trampoline activity for ConfirmDeviceCredential immediately
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
Maurice Lam [Fri, 11 Sep 2015 18:10:45 +0000 (18:10 +0000)]
Merge "[AccountSettings] Start add account in new task"
Baligh Uddin [Fri, 11 Sep 2015 17:00:28 +0000 (17:00 +0000)]
am
7e681ef5: (-s ours) am
ad4de2fa: (-s ours) am
c5d18345: (-s ours) am
cdf00b16: (-s ours) am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
7e681ef59442d803c7b9bc33fa92a3c8a15c5796':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:50:21 +0000 (16:50 +0000)]
am
ad4de2fa: (-s ours) am
c5d18345: (-s ours) am
cdf00b16: (-s ours) am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
ad4de2fa60a490bf922051c515cf8ac0a133a8cf':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:47:18 +0000 (16:47 +0000)]
am
5215f65c: (-s ours) am
730a73da: (-s ours) am
cf80d7c4: (-s ours) am
723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5215f65c167fbe0814155273a0c4348cc8dac2f4':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:41:33 +0000 (16:41 +0000)]
am
c5d18345: (-s ours) am
cdf00b16: (-s ours) am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
c5d183458c13a0d780aee93f256ea5dc6b22f815':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:40:01 +0000 (16:40 +0000)]
am
730a73da: (-s ours) am
cf80d7c4: (-s ours) am
723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
730a73daace1bafb86eeceb79b6d623d2feab2d9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:32:04 +0000 (16:32 +0000)]
am
cdf00b16: (-s ours) am
1538dde4: (-s ours) Import translations. DO NOT MERGE
* commit '
cdf00b1640bc621d513dcb965f44a4ace8bacece':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:30:31 +0000 (16:30 +0000)]
am
cf80d7c4: (-s ours) am
723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
cf80d7c4f03f8c55963b4815c1b7004d77cb9e5b':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 11 Sep 2015 16:24:31 +0000 (16:24 +0000)]
am
723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
723c5b38b8fbd2db3a64b1ce782f8f760271ac98':
Import translations. DO NOT MERGE
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:23 +0000 (16:19 +0000)]
Merge "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:50:44 +0000 (03:50 +0000)]
am
908243c3: am
a4b5e202: am
5628251b: am
5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
* commit '
908243c3ea91bfb2a317daa5fe668006c717a62f':
Fix crash in when restoring CredentialCheckResultTracker Fragment
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 02:25:37 +0000 (02:25 +0000)]
am
a4b5e202: am
5628251b: am
5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
* commit '
a4b5e202d5a76f13d2c528fc9e589113a4955c20':
Fix crash in when restoring CredentialCheckResultTracker Fragment
Jorim Jaggi [Fri, 11 Sep 2015 02:18:10 +0000 (02:18 +0000)]
am
5628251b: am
5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
* commit '
5628251b1bf051e73b6a8f1edd50b3e7447b06eb':
Fix crash in when restoring CredentialCheckResultTracker Fragment
Jorim Jaggi [Fri, 11 Sep 2015 02:09:36 +0000 (02:09 +0000)]
am
5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
* commit '
5c49b5a4b2cb1d90a02ce8610340db7020715de7':
Fix crash in when restoring CredentialCheckResultTracker Fragment
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
Sanket Padawe [Fri, 14 Aug 2015 22:49:02 +0000 (15:49 -0700)]
Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Bug:
15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
Sanket Padawe [Thu, 10 Sep 2015 02:21:17 +0000 (19:21 -0700)]
Fix crash in WiFi Settings test code.
Bug:
23264452
Change-Id: I285512fe4c0dbc842e041b551819d650f5cf9bbe
Maurice Lam [Fri, 21 Aug 2015 23:06:23 +0000 (16:06 -0700)]
[AccountSettings] Start add account in new task
Start add account activities in a new task separate from settings
so that users can reach it from recents later, even if they navigate
to a different settings screen (via launcher) like selecting Wi-Fi.
Bug:
22351974
Change-Id: Icd3e20fa8f2426276c52cd11cbc916c56ca86ee3
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
Baligh Uddin [Thu, 10 Sep 2015 21:24:34 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e301f2fd2ee2b4e2e91b5e7f3b910ebf708f7cd
Auto-generated-cl: translation import
Maurice Lam [Thu, 10 Sep 2015 20:57:13 +0000 (20:57 +0000)]
Merge "[ScreenLockSetup] Create separate title string"
Jason Monk [Thu, 10 Sep 2015 20:53:52 +0000 (20:53 +0000)]
am
cde29f77: am
618bc11b: am
72fecf9f: am
d3c60afe: Include the usb data mode regardless of data role
* commit '
cde29f771a85dc3f7e5b567ffcaa07aaa486fcf4':
Include the usb data mode regardless of data role
Jason Monk [Thu, 10 Sep 2015 20:48:48 +0000 (20:48 +0000)]
am
618bc11b: am
72fecf9f: am
d3c60afe: Include the usb data mode regardless of data role
* commit '
618bc11b0da63c25e70678d8fadf5f01ca7f13ec':
Include the usb data mode regardless of data role
Jason Monk [Thu, 10 Sep 2015 20:41:37 +0000 (20:41 +0000)]
am
72fecf9f: am
d3c60afe: Include the usb data mode regardless of data role
* commit '
72fecf9f0a640554d9c00e087e4cb2ce8fea3d77':
Include the usb data mode regardless of data role
Jason Monk [Thu, 10 Sep 2015 20:35:52 +0000 (20:35 +0000)]
am
d3c60afe: Include the usb data mode regardless of data role
* commit '
d3c60afe5267eb614b9c0a99b797e6bbb51de16f':
Include the usb data mode regardless of data role
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
Maurice Lam [Thu, 10 Sep 2015 19:05:14 +0000 (12:05 -0700)]
[ScreenLockSetup] Create separate title string
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.
Bug:
23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
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 01:48:27 +0000 (18:48 -0700)]
resolved conflicts for
99bbec73 to master
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
Jorim Jaggi [Thu, 10 Sep 2015 01:11:44 +0000 (01:11 +0000)]
am
f37368db: am
ef5f9e39: am
48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
* commit '
f37368db841ce534cc1712b54b1c88bcbe991756':
Add double-tap power button to open camera 2/2
Maurice Lam [Thu, 10 Sep 2015 01:03:54 +0000 (01:03 +0000)]
Merge "[WifiSetup] Suppress crash during Wi-Fi setup"
Jorim Jaggi [Thu, 10 Sep 2015 01:02:39 +0000 (01:02 +0000)]
am
ef5f9e39: am
48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
* commit '
ef5f9e3952ac35df4ce4335be0020ae81b11f746':
Add double-tap power button to open camera 2/2
Jorim Jaggi [Thu, 10 Sep 2015 00:53:48 +0000 (00:53 +0000)]
am
48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
* commit '
48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
Add double-tap power button to open camera 2/2
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 23:22:50 +0000 (23:22 +0000)]
am
eddb0493: am
93b39ff9: am
01f44efa: am
179fa507: 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 reache
* commit '
eddb04934b2b52ab0ff6545515df8f0801f538c0':
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.
Jim Miller [Wed, 9 Sep 2015 23:14:27 +0000 (23:14 +0000)]
am
93b39ff9: am
01f44efa: am
179fa507: 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 (FINGERPRIN
* commit '
93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
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.
Jim Miller [Wed, 9 Sep 2015 23:08:06 +0000 (23:08 +0000)]
am
01f44efa: am
179fa507: 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_TIMEO
* commit '
01f44efab0673e8648470c8be1670730660a4778':
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.
Maurice Lam [Wed, 9 Sep 2015 23:03:00 +0000 (16:03 -0700)]
[WifiSetup] Suppress crash during Wi-Fi setup
Bug:
23936498
Change-Id: I7d97995cfb3c904aee3fc1baa50ea3dafe7d72ea
Jim Miller [Wed, 9 Sep 2015 23:02:34 +0000 (23:02 +0000)]
am
179fa507: 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 enro
* commit '
179fa5078b6e105e6e01e82c0af7c43745c452b0':
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.
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 [Wed, 9 Sep 2015 18:32:10 +0000 (18:32 +0000)]
am
605685ce: am
5fc62441: am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
605685ceae58d6a0c920ec4f809cf11cd32c34e1':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 18:14:08 +0000 (18:14 +0000)]
am
5fc62441: am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
5fc624418c11d8a949c6ab61fa3c0b0bc2fb2d46':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 18:06:25 +0000 (18:06 +0000)]
am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 17:58:29 +0000 (17:58 +0000)]
am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
Hide or show APNs with type="ims" as CarrierConfig
Alan Viverette [Wed, 9 Sep 2015 14:27:52 +0000 (10:27 -0400)]
Rename night mode back to Night mode
Which is technically correct (the best correct) and appropriately
manages user expectations.
Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
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 22:16:53 +0000 (22:16 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 22:07:52 +0000 (22:07 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 22:02:24 +0000 (22:02 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 21:53:45 +0000 (21:53 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 21:40:27 +0000 (14:40 -0700)]
Fix build
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
Jorim Jaggi [Tue, 8 Sep 2015 21:39:53 +0000 (21:39 +0000)]
am
6599eb9a: am
52aca96c: am
64ea62a3: am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
6599eb9af255f1e0406b813d038737d5a3c11942':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Tue, 8 Sep 2015 21:36:04 +0000 (21:36 +0000)]
am
52aca96c: am
64ea62a3: am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
52aca96c0bd1a52aab3e42c08b10fed7c5763773':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Tue, 8 Sep 2015 21:26:38 +0000 (21:26 +0000)]
am
64ea62a3: am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
64ea62a30a416b46ecdb2042e052825b96702012':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Tue, 8 Sep 2015 21:17:06 +0000 (21:17 +0000)]
am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
8c543276f1dd366bd142ce44a8e3084fddb22971':
Fix crash in fingerprint settings when rotating
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
Julia Reynolds [Tue, 8 Sep 2015 17:14:02 +0000 (17:14 +0000)]
Merge "Differentiate battery optimization string."