Jim Miller
d251fed3ef
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
2015-09-19 00:59:51 +00:00
Justin Harrison
fa9d8258d4
am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
Add color transform setting
2015-09-19 00:46:06 +00:00
Adam Lesinski
c62f8ea234
am 0896a2e5: am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '0896a2e545f88785c2a07a4de91d4f5ea67c1a57':
Update implementation to match BatteryStats.Uid
2015-09-19 00:46:05 +00:00
Justin Harrison
8a44f2c413
am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'a3add1d2086f82c8d176ca0a72a7cbd8b98c19ff':
Add color transform setting
2015-09-19 00:37:40 +00:00
Justin Harrison
a3add1d208
am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev
...
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
Add color transform setting
2015-09-19 00:29:31 +00:00
Justin Harrison
c6a96d4076
Merge "Add color transform setting" into mnc-dr-dev
2015-09-19 00:21:45 +00:00
Adam Lesinski
1f78f774ca
Update implementation to match BatteryStats.Uid
...
(cherry picked from commit 2350b8445c
2015-09-18 17:12:30 -07:00
Jason Monk
0217281d33
Add color transform setting
...
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
2015-09-18 20:11:01 -04:00
Jim Miller
d433359684
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
2015-09-18 15:37:48 -07:00
Adam Lesinski
0896a2e545
am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '65477c800fabbce6586bc2782ce56167e0bd2734':
Update implementation to match BatteryStats.Uid
2015-09-18 20:42:31 +00:00
Adam Lesinski
65477c800f
am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
...
* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
Update implementation to match BatteryStats.Uid
2015-09-18 20:32:04 +00:00
Adam Lesinski
031bbef57e
Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev
2015-09-18 20:26:06 +00:00
Baligh Uddin
8223038551
Import translations. DO NOT MERGE
...
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
2015-09-18 10:37:08 -07:00
Paul Lawrence
e68e93fc36
am 67d0fe4c: am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
Stop long passwords crashing CryptKeeper
2015-09-18 15:57:21 +00:00
Paul Lawrence
67d0fe4c0e
am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'fe9b6d3e2e08e689a6b770df497e717a1a5e767e':
Stop long passwords crashing CryptKeeper
2015-09-18 15:49:04 +00:00
Paul Lawrence
fe9b6d3e2e
am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
Stop long passwords crashing CryptKeeper
2015-09-18 15:38:15 +00:00
Paul Lawrence
aead1b2581
am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
Stop long passwords crashing CryptKeeper
2015-09-18 15:32:29 +00:00
Paul Lawrence
43be4b9b78
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
2015-09-18 15:26:01 +00:00
Paul Lawrence
9db2961ad0
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
2015-09-18 14:58:04 +00:00
Paul Lawrence
1ec8f89b8e
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
2015-09-18 14:49:49 +00:00
Paul Lawrence
98e9c7472c
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
2015-09-18 14:44:08 +00:00
Paul Lawrence
8d28491a2f
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
2015-09-18 14:37:01 +00:00
Paul Lawrence
c2e73bbc06
Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
2015-09-18 14:31:11 +00:00
Zach Jang
8fc9b5b684
am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:40:30 +00:00
Zach Jang
2e006b2b07
am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48
am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8
am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
...
* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
2015-09-17 20:04:24 +00:00
Zach Jang
c87ceb7ec1
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
2015-09-17 20:04:18 +00:00
Paul Lawrence
44985b9ccd
Stop long passwords crashing CryptKeeper
...
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
2015-09-16 15:29:57 -07:00
Baligh Uddin
647ab07f95
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
2015-09-15 14:37:45 +00:00
Baligh Uddin
cdf9e48335
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
2015-09-15 14:32:12 +00:00
Baligh Uddin
e4c1dccda9
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
2015-09-15 14:27:34 +00:00
Baligh Uddin
6df1ad97c9
am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'ba98cc2c1463b33c383e8399eb7742aa50b5a027':
Import translations. DO NOT MERGE
2015-09-15 14:20:20 +00:00
Baligh Uddin
66402753e4
Merge "Import translations. DO NOT MERGE"
2015-09-15 14:12:45 +00:00
Baligh Uddin
ba98cc2c14
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-15 14:12:42 +00:00
Hyejin
7837e0272b
am 375633ae: am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '375633aea2a5ba9b0fc3b099bead8bbfef6a4cf3':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:49:17 +00:00
Hyejin
375633aea2
am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '1dcb1135b8157977cd44c05768f422243d64df83':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:45:21 +00:00
Hyejin
1dcb1135b8
am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '7e84e35fb191c0967feb0352a39a3147ceb68a8b':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:37:16 +00:00
Hyejin
7e84e35fb1
am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '5565b5cd7537e9360e6382507a45cf5e091a5108':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:29:32 +00:00
Hyejin
5565b5cd75
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
2015-09-14 16:04:52 -07:00
Paul Lawrence
4f60679b76
Remove don't kill flag from CryptKeeper to stop logspam
...
Bug: 23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
2015-09-14 14:55:57 -07:00
Zach Jang
6ceb2ba9b8
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
...
CL#3/3
b/23946860
Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
2015-09-14 14:03:12 -07:00
Maurice Lam
2662df8433
[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
2015-09-14 12:07:06 -07:00
Baligh Uddin
6ea05b747d
Import translations. DO NOT MERGE
...
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
2015-09-14 03:20:45 -07:00
Baligh Uddin
eb1c872563
Import translations. DO NOT MERGE
...
Change-Id: I80c5843b1be74f3b58aa812986ff04680f588b2c
Auto-generated-cl: translation import
2015-09-14 02:48:18 -07:00
Selim Cinek
e3be8eb3e5
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.
2015-09-12 05:07:53 +00:00
Jorim Jaggi
22bf95e650
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
2015-09-12 02:57:18 +00:00
Jorim Jaggi
30c5aed420
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
2015-09-12 02:57:17 +00:00
Selim Cinek
f19b9b6d88
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.
2015-09-12 00:56:55 +00:00
Selim Cinek
0fe43c9aec
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.
2015-09-12 00:47:34 +00:00
