Jorim Jaggi
a4b5e202d5
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
2015-09-11 02:18:10 +00:00
Jorim Jaggi
5628251b1b
am 5c49b5a4
: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
...
* commit '5c49b5a4b2cb1d90a02ce8610340db7020715de7':
Fix crash in when restoring CredentialCheckResultTracker Fragment
2015-09-11 02:09:36 +00:00
Jorim Jaggi
5c49b5a4b2
Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev
2015-09-11 01:58:55 +00:00
Baligh Uddin
196555c71b
Import translations. DO NOT MERGE
...
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
2015-09-10 14:56:41 -07:00
Baligh Uddin
1538dde4fb
Import translations. DO NOT MERGE
...
Change-Id: I4e9b6d6564301a352d9034269dbd989b728555f5
Auto-generated-cl: translation import
2015-09-10 14:53:10 -07:00
Jason Monk
cde29f771a
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
2015-09-10 20:48:48 +00:00
Jason Monk
618bc11b0d
am 72fecf9f
: am d3c60afe
: Include the usb data mode regardless of data role
...
* commit '72fecf9f0a640554d9c00e087e4cb2ce8fea3d77':
Include the usb data mode regardless of data role
2015-09-10 20:41:37 +00:00
Jason Monk
72fecf9f0a
am d3c60afe
: Include the usb data mode regardless of data role
...
* commit 'd3c60afe5267eb614b9c0a99b797e6bbb51de16f':
Include the usb data mode regardless of data role
2015-09-10 20:35:52 +00:00
Jorim Jaggi
69671dafc8
Fix crash in when restoring CredentialCheckResultTracker Fragment
...
Bug: 23956504
Change-Id: I884e47a793d6bc00cc0c54fe9e3d4bcf4e0199c1
2015-09-10 13:35:04 -07:00
Jason Monk
d3c60afe52
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
2015-09-10 10:38:14 -04:00
Jorim Jaggi
99bbec733d
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
2015-09-10 01:11:44 +00:00
Jorim Jaggi
f37368db84
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
2015-09-10 01:02:39 +00:00
Jorim Jaggi
ef5f9e3952
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
2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3
Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev
2015-09-10 00:25:59 +00:00
Jim Miller
eddb04934b
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.
2015-09-09 23:14:27 +00:00
Jim Miller
93b39ff9bd
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.
2015-09-09 23:08:06 +00:00
Jim Miller
01f44efab0
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.
2015-09-09 23:02:34 +00:00
Jim Miller
179fa5078b
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
2015-09-09 22:53:53 +00:00
Jorim Jaggi
cc1e9f7ce7
Add double-tap power button to open camera 2/2
...
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
2015-09-09 22:40:00 +00:00
Jim Miller
457904634c
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
2015-09-09 15:30:40 -07:00
Sungmin Choi
605685ceae
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
2015-09-09 18:14:08 +00:00
Sungmin Choi
5fc624418c
am 9819dcb9
: am 9fcc7e1b
: Hide or show APNs with type="ims" as CarrierConfig
...
* commit '9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
Hide or show APNs with type="ims" as CarrierConfig
2015-09-09 18:06:25 +00:00
Sungmin Choi
9819dcb93e
am 9fcc7e1b
: Hide or show APNs with type="ims" as CarrierConfig
...
* commit '9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
Hide or show APNs with type="ims" as CarrierConfig
2015-09-09 17:58:29 +00:00
Sungmin Choi
9fcc7e1b20
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
2015-09-08 17:23:14 -07:00
Jorim Jaggi
2ca86be437
am c0c0bf30
: am 5cca5a5a
: am b83cbe20
: Fix build
...
* commit 'c0c0bf30095a47b7a82df87b08e4d55bb2105350':
Fix build
2015-09-08 22:07:52 +00:00
Jorim Jaggi
c0c0bf3009
am 5cca5a5a
: am b83cbe20
: Fix build
...
* commit '5cca5a5a2c54e3ca64df5a2dc7c7bdf4cecf6507':
Fix build
2015-09-08 22:02:24 +00:00
Jorim Jaggi
5cca5a5a2c
am b83cbe20
: Fix build
...
* commit 'b83cbe202bd56cf542d898837474757dca3625f2':
Fix build
2015-09-08 21:53:45 +00:00
Jorim Jaggi
b83cbe202b
Fix build
...
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
2015-09-08 21:42:17 +00:00
Jorim Jaggi
6599eb9af2
am 52aca96c
: am 64ea62a3
: am 8c543276
: Fix crash in fingerprint settings when rotating
...
* commit '52aca96c0bd1a52aab3e42c08b10fed7c5763773':
Fix crash in fingerprint settings when rotating
2015-09-08 21:36:04 +00:00
Jorim Jaggi
52aca96c0b
am 64ea62a3
: am 8c543276
: Fix crash in fingerprint settings when rotating
...
* commit '64ea62a30a416b46ecdb2042e052825b96702012':
Fix crash in fingerprint settings when rotating
2015-09-08 21:26:38 +00:00
Jorim Jaggi
64ea62a30a
am 8c543276
: Fix crash in fingerprint settings when rotating
...
* commit '8c543276f1dd366bd142ce44a8e3084fddb22971':
Fix crash in fingerprint settings when rotating
2015-09-08 21:17:06 +00:00
Jorim Jaggi
8c543276f1
Fix crash in fingerprint settings when rotating
...
Fragments always need empty constructors.
Bug: 23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
2015-09-08 20:43:16 +00:00
Geoff Mendal
8375466fe9
am 593714a8
: (-s ours) am f1e6378a
: (-s ours) am f1a62026
: (-s ours) Import translations. DO NOT MERGE
...
* commit '593714a8d135f7ddafd2ae369cfd09777afdb8e5':
Import translations. DO NOT MERGE
2015-09-07 15:58:42 +00:00
Geoff Mendal
593714a8d1
am f1e6378a
: (-s ours) am f1a62026
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1e6378a7e181fadd0ccd007dc7249d7ad250a24':
Import translations. DO NOT MERGE
2015-09-07 15:51:05 +00:00
Geoff Mendal
f1e6378a7e
am f1a62026
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1a62026b83b54b5f234cd87df66fa32f754c914':
Import translations. DO NOT MERGE
2015-09-07 15:42:38 +00:00
Geoff Mendal
f1a62026b8
Import translations. DO NOT MERGE
...
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
2015-09-07 08:35:11 -07:00
Adam Lesinski
2350b8445c
Update implementation to match BatteryStats.Uid
...
Change-Id: Ibdb7dc4b98c5a365c97bb56ad51e936b51892d3f
2015-09-06 01:57:58 -07:00
Jason Monk
7af285b3fc
am 3f2ac58c
: am 07b26bb3
: am 1cfaf01f
: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '3f2ac58c932311fa61bc848af7aceec6f0f3a63d':
Start tether service with redeliver intent
2015-09-03 18:36:00 +00:00
Jason Monk
3f2ac58c93
am 07b26bb3
: am 1cfaf01f
: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '07b26bb3fcc35d990be7263afe546445d23938b2':
Start tether service with redeliver intent
2015-09-03 18:25:57 +00:00
Jason Monk
07b26bb3fc
am 1cfaf01f
: Merge "Start tether service with redeliver intent" into mnc-dr-dev
...
* commit '1cfaf01fdaba22884a126a84748cf3a619785b3e':
Start tether service with redeliver intent
2015-09-03 18:14:51 +00:00
Jason Monk
1cfaf01fda
Merge "Start tether service with redeliver intent" into mnc-dr-dev
2015-09-03 17:51:09 +00:00
Jason Monk
09ea9724fa
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
2015-09-03 12:50:01 -04:00
Jorim Jaggi
469447bb8c
am bfacb5f4
: am 98d91550
: am c624a72b
: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit 'bfacb5f483b6fe8c117d8df9ab0a1bbe3909df26':
Fix fingerprint settings ripples
2015-09-03 06:23:58 +00:00
Maurice Lam
570852da18
am 84afdfde
: am 82db64e9
: am d8723073
: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
...
* commit '84afdfdefaa935764aff589799b3ccf3a2fa06a1':
[Fingerprint] Update strings for skip dialog
2015-09-03 06:23:36 +00:00
Sungmin Choi
eeb5f8f1a2
am a43a40ff
: am e31208ae
: am 05c7dde1
: To hide none security option, use config_hide_none_security_option config
...
* commit 'a43a40ffe7e55a4421635fc0a47ede295f2d61ed':
To hide none security option, use config_hide_none_security_option config
2015-09-03 06:22:57 +00:00
Geoff Mendal
10c447c2cd
am 532ebb9f
: (-s ours) am 8ee8b379
: (-s ours) am e182fa77
: (-s ours) Import translations. DO NOT MERGE
...
* commit '532ebb9f7afaf512567811fe8cdb9b74376b00c2':
Import translations. DO NOT MERGE
2015-09-03 06:21:36 +00:00
Jorim Jaggi
bfacb5f483
am 98d91550
: am c624a72b
: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit '98d91550b624ca942fea7d096835c5bdf73f9af2':
Fix fingerprint settings ripples
2015-09-03 01:37:47 +00:00
Jorim Jaggi
98d91550b6
am c624a72b
: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
...
* commit 'c624a72be19027a0784fb41575129b334ff02ae7':
Fix fingerprint settings ripples
2015-09-03 01:28:51 +00:00
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