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
Julia Reynolds
fcfe3d82d2
Merge "Switch font size from a dialog to dropdown preference."
2015-08-13 14:42:39 +00:00
Julia Reynolds
a02bc9991d
Switch font size from a dialog to dropdown preference.
...
Bug: 16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
2015-08-13 10:40:29 -04:00
Jorim Jaggi
c03459cd05
am 90ca1b67: am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit '90ca1b67cfa1507126c6b74b2de059d3bf579734':
Wait with finishing until fingerprints are removed
2015-08-13 03:18:43 +00:00
Dianne Hackborn
ca9433519b
am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 02:10:09 +00:00
Jorim Jaggi
90ca1b67cf
am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit '0cae8ad78170d56beaafcb18015e25421895ac50':
Wait with finishing until fingerprints are removed
2015-08-13 01:42:13 +00:00
Jorim Jaggi
e9639b1d01
am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
...
* commit '5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
Wait with finishing until fingerprints are removed
2015-08-13 01:28:21 +00:00
Dianne Hackborn
a0b5ab0ef6
am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:18:08 +00: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
2be290cf36
am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 01:02:23 +00: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
4b0e84d667
Merge "Make DropDownPreference extend ListPreference"
2015-08-12 18:23:13 +00: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
28c78cc854
am f974b78d: am 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit 'f974b78d36f7bd449d3dbfc7c7c64e273cb16c78':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 18:09:32 +00:00
Sanket Padawe
f974b78d36
am 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit '8d425a526b383c1e0c2d60fd3c27f7a5dd5e5e2f':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 18:03:56 +00:00
Sanket Padawe
d0513282f8
am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
...
* commit '1d29bde1f5369b5cb5b24adbad662ef33524f4e2':
Avoid sending identity along with EAP sim, aka & aka'.
2015-08-12 17:34:42 +00: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
Jason Monk
49b6103b56
Make DropDownPreference extend ListPreference
...
Lots of updates to handle static setting of entries/values
Callbacks are now through preference changes
Fix weird inconsistencies in callback return values...
Change-Id: I2ebe02c3492ce543162efcd55bdae3f2c4039287
2015-08-12 13:01:38 -04:00
Todd Kennedy
c37a80990b
Merge "Add force external setting"
2015-08-12 16:53:32 +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
270418980a
am 9ee3a615: am f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '9ee3a615463faec08d4dfb9b045f9211c93d742e':
[ConfirmPattern] use correct user id for stealth mode
2015-08-12 00:00:22 +00:00
Andres Morales
9ee3a61546
am f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit 'f1808dcafc45fea92e27b5300f4d6cc742bb3105':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:56:36 +00:00
Andres Morales
e5d646841d
am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit 'a7bdde58856c7cf776cb326b7a1a9c58d649b3f8':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:43:51 +00: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
Paul Lawrence
517b83beb6
am ce555844: am a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit 'ce55584478ee3f7e2a50c718efd79b834f326741':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 23:23:48 +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
Paul Lawrence
ce55584478
am a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit 'a66240fd94cb458cb1e938419abad676b8132ca5':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 23:03:18 +00:00
Paul Lawrence
550f66edfe
am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
...
* commit '68f79718f7c4f648533e1ecd7f66d0b30f161b64':
Gray out confirm button on pattern/pin/password set dialog
2015-08-11 22:25:31 +00:00
Paul Lawrence
68f79718f7
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
2015-08-11 22:20:53 +00:00
Paul Lawrence
cff37ecbdd
Gray out confirm button on pattern/pin/password set dialog
...
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.
Note that this requires async tasks so that the button is shown as gray
in a timely way.
Also don't add another stage - this causes a11y to repeat the title.
Bug: 22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
2015-08-11 15:17:04 -07:00
Jason Monk
fe7a25f8fe
am 1e29e6b9: am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138':
Add setting to disable camera gesture
2015-08-11 14:20:29 +00:00
Jason Monk
1e29e6b9ec
am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '31227bfaf12ede192474bb162f1555215ffa605b':
Add setting to disable camera gesture
2015-08-11 14:12:00 +00:00
Jason Monk
bce29c8a01
am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
Add setting to disable camera gesture
2015-08-11 14:02:37 +00:00
Jason Monk
746886c59a
Merge "Add setting to disable camera gesture" into mnc-dr-dev
2015-08-11 13:55:54 +00:00
Dianne Hackborn
70c52fcbf8
am 0583f297: am b98206c9: am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit '0583f297f8223cacda71bda5b2b896cc03031b89':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:50:00 +00:00
Dianne Hackborn
0583f297f8
am b98206c9: am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'b98206c99e687d043702df01d6a7a4a4273c82a8':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:42:51 +00:00
Dianne Hackborn
01cfaadeeb
am e9bcef35: am be4df036: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:28:17 +00:00
Dianne Hackborn
e9bcef3541
am be4df036: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:19:40 +00:00
Dianne Hackborn
be4df036e1
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
2015-08-10 17:07:14 -07:00
Julia Reynolds
f4a6994106
am 0b514bdd: am 415d6a24: am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '0b514bdd219e28cb1c920265fe36c1c30a6c8d5c':
Wrap text on long preferences.
2015-08-10 21:07:50 +00:00
Julia Reynolds
0b514bdd21
am 415d6a24: am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '415d6a2411edfd72764bfd82208eff6020d85add':
Wrap text on long preferences.
2015-08-10 20:59:29 +00:00
Julia Reynolds
f47896d223
am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
Wrap text on long preferences.
2015-08-10 20:45:56 +00:00
Jason Monk
b4b4e2a981
am d1cecdd3: am 55511dab: am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit 'd1cecdd33e7366e5b23dcc7f05078bde0b43c13c':
Remove extra help & feedback menu from power usage
2015-08-10 20:39:46 +00:00
Julia Reynolds
77dc56bc4c
am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
2015-08-10 20:37:34 +00:00
Jason Monk
d1cecdd33e
am 55511dab: am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit '55511dab4fcd7410868670a6d39e88a91784d722':
Remove extra help & feedback menu from power usage
2015-08-10 20:34:04 +00:00
Julia Reynolds
2557d8a251
Merge "Wrap text on long preferences." into mnc-dev
2015-08-10 20:32:49 +00:00
Jason Monk
9614b50319
am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit 'a1f64bf207c452f9b0e6a558538d9614ca2bf655':
Remove extra help & feedback menu from power usage
2015-08-10 20:21:53 +00:00