OSDN Git Service
Todd Kennedy [Thu, 13 Aug 2015 19:57:37 +0000 (19:57 +0000)]
Merge "Fix string for translation"
Todd Kennedy [Thu, 13 Aug 2015 19:56:48 +0000 (12:56 -0700)]
Fix string for translation
Increase character limit and help provide some additional context for
the strings
Bug:
23175115
Bug:
23173307
Bug:
23172615
Change-Id: I27c67f39323f359744ae3791ea538030820dc0d0
Julia Reynolds [Thu, 13 Aug 2015 14:42:39 +0000 (14:42 +0000)]
Merge "Switch font size from a dialog to dropdown preference."
Julia Reynolds [Wed, 12 Aug 2015 18:51:34 +0000 (14:51 -0400)]
Switch font size from a dialog to dropdown preference.
Bug:
16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
Geoff Mendal [Thu, 13 Aug 2015 06:55:08 +0000 (06:55 +0000)]
am
06d14c52: (-s ours) am
b3852044: (-s ours) am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
06d14c5243af84dfb2ba1a9027c9215b6d751d1e':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 06:43:03 +0000 (06:43 +0000)]
am
b3852044: (-s ours) am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
b38520448f52683130a01728eab67018929775b2':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 05:09:45 +0000 (05:09 +0000)]
am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
93d1612d160f3e71c6dead490a36a334f6abb25f':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 05:04:41 +0000 (05:04 +0000)]
am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
8a12d17b09281f09adaf6685680f7cb991aef049':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)]
am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Jorim Jaggi [Thu, 13 Aug 2015 03:18:43 +0000 (03:18 +0000)]
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
Dianne Hackborn [Thu, 13 Aug 2015 02:10:09 +0000 (02:10 +0000)]
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
Jorim Jaggi [Thu, 13 Aug 2015 01:42:13 +0000 (01:42 +0000)]
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
Jorim Jaggi [Thu, 13 Aug 2015 01:35:51 +0000 (01:35 +0000)]
am
e9639b1d: am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
e9639b1d0141ce25548105a17eab3e30b6341f1a':
Wait with finishing until fingerprints are removed
Jorim Jaggi [Thu, 13 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
Wait with finishing until fingerprints are removed
Dianne Hackborn [Thu, 13 Aug 2015 01:18:08 +0000 (01:18 +0000)]
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
Jorim Jaggi [Thu, 13 Aug 2015 01:18:03 +0000 (01:18 +0000)]
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:11:07 +0000 (18:11 -0700)]
Wait with finishing until fingerprints are removed
Bug:
22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
Dianne Hackborn [Thu, 13 Aug 2015 01:09:10 +0000 (01:09 +0000)]
am
2be290cf: am
6a1e1e08: am
f67d0785: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
2be290cf36f06da260e67b430a625422da512609':
Fix issue #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 01:02:23 +0000 (01:02 +0000)]
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
Dianne Hackborn [Thu, 13 Aug 2015 00:54:31 +0000 (00:54 +0000)]
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
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I003564376a02a70f0245353472544cde355240ac
Jason Monk [Wed, 12 Aug 2015 18:23:13 +0000 (18:23 +0000)]
Merge "Make DropDownPreference extend ListPreference"
Sanket Padawe [Wed, 12 Aug 2015 18:09:32 +0000 (18:09 +0000)]
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'.
Sanket Padawe [Wed, 12 Aug 2015 18:03:56 +0000 (18:03 +0000)]
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'.
Sanket Padawe [Wed, 12 Aug 2015 17:50:54 +0000 (17:50 +0000)]
am
d0513282: am
1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev
* commit '
d0513282f81d8218eb0fef93a7316a6699d087f7':
Avoid sending identity along with EAP sim, aka & aka'.
Sanket Padawe [Wed, 12 Aug 2015 17:34:42 +0000 (17:34 +0000)]
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'.
Sanket Padawe [Wed, 12 Aug 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
Jason Monk [Wed, 12 Aug 2015 15:31:29 +0000 (11:31 -0400)]
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
Todd Kennedy [Wed, 12 Aug 2015 16:53:32 +0000 (16:53 +0000)]
Merge "Add force external setting"
Geoff Mendal [Wed, 12 Aug 2015 14:24:56 +0000 (14:24 +0000)]
am
0c49d5b9: (-s ours) am
ce821387: (-s ours) am
699ef29e: (-s ours) am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
0c49d5b9d08ad352af78d1e943623585f49a7f3f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:18:59 +0000 (14:18 +0000)]
am
ce821387: (-s ours) am
699ef29e: (-s ours) am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
ce821387ba6b6745a99c2a3231a5c0b2e42a34fc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:11:11 +0000 (14:11 +0000)]
am
699ef29e: (-s ours) am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
699ef29e9fcf59eb1023c767cceab4de4f64ae13':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:06:27 +0000 (14:06 +0000)]
am
42ae7fba: (-s ours) Import translations. DO NOT MERGE
* commit '
42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Aug 2015 14:00:45 +0000 (07:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
Geoff Mendal [Wed, 12 Aug 2015 13:11:54 +0000 (06:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9361c89e61ac3f958dc840806aae88fece5d4aab
Auto-generated-cl: translation import
Sanket Padawe [Wed, 12 Aug 2015 01:42:36 +0000 (18:42 -0700)]
Avoid sending identity along with EAP sim, aka & aka'.
Bug:
22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
Andres Morales [Wed, 12 Aug 2015 00:00:22 +0000 (00:00 +0000)]
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
Dianne Hackborn [Wed, 12 Aug 2015 00:00:20 +0000 (00:00 +0000)]
am
5876e309: am
0f440a70: am
540afe77: am
e2e76435: am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
5876e30931915f3dcfcf044e7ce46ca039ace75a':
Fix issue #
23079119: Description for write settings permission says...
Andres Morales [Tue, 11 Aug 2015 23:56:36 +0000 (23:56 +0000)]
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
Dianne Hackborn [Tue, 11 Aug 2015 23:56:35 +0000 (23:56 +0000)]
am
0f440a70: am
540afe77: am
e2e76435: am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
0f440a701cc32fab7a522fe677ee4c280ca648f8':
Fix issue #
23079119: Description for write settings permission says...
Andres Morales [Tue, 11 Aug 2015 23:48:50 +0000 (23:48 +0000)]
am
e5d64684: am
a7bdde58: am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
e5d646841d62484939c660e078c712866c64f244':
[ConfirmPattern] use correct user id for stealth mode
Dianne Hackborn [Tue, 11 Aug 2015 23:48:49 +0000 (23:48 +0000)]
am
540afe77: am
e2e76435: am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
Fix issue #
23079119: Description for write settings permission says...
Andres Morales [Tue, 11 Aug 2015 23:43:51 +0000 (23:43 +0000)]
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
Maurice Lam [Tue, 11 Aug 2015 23:39:44 +0000 (23:39 +0000)]
am
305c4335: am
d2174636: am
4797364d: am
a430ac56: am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
305c4335512f9a9c42b0925e8b23b869348c3d95':
[Fingerprint] Use different ring size for setup
Dianne Hackborn [Tue, 11 Aug 2015 23:39:23 +0000 (23:39 +0000)]
am
e2e76435: am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
e2e76435f4a0604d751b32838409421b072ca25d':
Fix issue #
23079119: Description for write settings permission says...
Andres Morales [Tue, 11 Aug 2015 23:35:59 +0000 (23:35 +0000)]
am
9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
* commit '
9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
Maurice Lam [Tue, 11 Aug 2015 23:32:26 +0000 (23:32 +0000)]
am
d2174636: am
4797364d: am
a430ac56: am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
d2174636293e52d4df01f191787df62e96e994d3':
[Fingerprint] Use different ring size for setup
Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]
Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
Maurice Lam [Tue, 11 Aug 2015 23:27:00 +0000 (23:27 +0000)]
am
4797364d: am
a430ac56: am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
4797364d8ac175b3322f7adcb5963602f2bb18d0':
[Fingerprint] Use different ring size for setup
Dianne Hackborn [Tue, 11 Aug 2015 23:26:45 +0000 (23:26 +0000)]
am
8500822b: Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
* commit '
8500822b8e39473e272a0c4e84349aa9dadf763f':
Fix issue #
23079119: Description for write settings permission says...
Paul Lawrence [Tue, 11 Aug 2015 23:23:48 +0000 (23:23 +0000)]
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
Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]
Merge "Fix issue #
23079119: Description for write settings permission says..." into mnc-dev
Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]
[ConfirmPattern] use correct user id for stealth mode
Bug:
23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
Maurice Lam [Tue, 11 Aug 2015 23:15:33 +0000 (23:15 +0000)]
am
a430ac56: am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
a430ac56b22da424abeda82ca074ef19d5e9cd56':
[Fingerprint] Use different ring size for setup
Paul Lawrence [Tue, 11 Aug 2015 23:03:18 +0000 (23:03 +0000)]
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
Maurice Lam [Tue, 11 Aug 2015 22:43:35 +0000 (22:43 +0000)]
am
3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
* commit '
3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
Paul Lawrence [Tue, 11 Aug 2015 22:35:26 +0000 (22:35 +0000)]
am
550f66ed: am
68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
* commit '
550f66edfe5ebafde3afc3ba3fd7e4160373df36':
Gray out confirm button on pattern/pin/password set dialog
Paul Lawrence [Tue, 11 Aug 2015 22:25:31 +0000 (22:25 +0000)]
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
Paul Lawrence [Tue, 11 Aug 2015 22:20:53 +0000 (22:20 +0000)]
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
Paul Lawrence [Mon, 3 Aug 2015 16:44:23 +0000 (09:44 -0700)]
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
Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]
Fix issue #
23079119: Description for write settings permission says...
...it is for read and write
Just write.
And let's say, modify.
Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
Jason Monk [Tue, 11 Aug 2015 14:20:29 +0000 (14:20 +0000)]
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
Jason Monk [Tue, 11 Aug 2015 14:12:00 +0000 (14:12 +0000)]
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
Jason Monk [Tue, 11 Aug 2015 14:08:02 +0000 (14:08 +0000)]
am
bce29c8a: am
746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit '
bce29c8a012a27d4cd4ca87892d215e29a793fa7':
Add setting to disable camera gesture
Jason Monk [Tue, 11 Aug 2015 14:02:37 +0000 (14:02 +0000)]
am
746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit '
746886c59a20dc33d62c2dd500fd27edcf0abcca':
Add setting to disable camera gesture
Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]
Merge "Add setting to disable camera gesture" into mnc-dr-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:50:00 +0000 (00:50 +0000)]
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
Dianne Hackborn [Tue, 11 Aug 2015 00:42:51 +0000 (00:42 +0000)]
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
Dianne Hackborn [Tue, 11 Aug 2015 00:38:31 +0000 (00:38 +0000)]
am
c7fbbf0d: am
c262c522: am
6fcacc41: am
fc7633ca: am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
c7fbbf0d7c9b1fd432dd702c2a46f039c463fd85':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Tue, 11 Aug 2015 00:35:12 +0000 (00:35 +0000)]
am
01cfaade: am
e9bcef35: am
be4df036: Fix issue #
23037899: Support for Battery Optimization permission + Dialog
* commit '
01cfaadeeb9eb98f9a772a85ba6c4e1034319fb5':
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Tue, 11 Aug 2015 00:33:41 +0000 (00:33 +0000)]
am
c262c522: am
6fcacc41: am
fc7633ca: am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
c262c522ae2ae31b5a6d1217efb40cbf81bbef59':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Tue, 11 Aug 2015 00:28:17 +0000 (00:28 +0000)]
am
e9bcef35: am
be4df036: Fix issue #
23037899: Support for Battery Optimization permission + Dialog
* commit '
e9bcef3541435c1e1a2716d48eb1c1c897841880':
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Tue, 11 Aug 2015 00:27:06 +0000 (00:27 +0000)]
am
6fcacc41: am
fc7633ca: am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
6fcacc41273a195dfa0f4cbca93c4eafe32edd1d':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Tue, 11 Aug 2015 00:19:40 +0000 (00:19 +0000)]
am
be4df036: Fix issue #
23037899: Support for Battery Optimization permission + Dialog
* commit '
be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
Dianne Hackborn [Tue, 11 Aug 2015 00:19:07 +0000 (00:19 +0000)]
am
fc7633ca: am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
fc7633cae2aec30f32adbc26d3e24a8005e773f5':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Tue, 11 Aug 2015 00:11:09 +0000 (00:11 +0000)]
am
ba38155d: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]
Fix issue #
23037899: Support for Battery Optimization permission + Dialog
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]
Fix issue #
23037720: New Battery Optimization Strings
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
Jorim Jaggi [Mon, 10 Aug 2015 23:07:42 +0000 (16:07 -0700)]
Fix fingerprint string descriptions
Change-Id: I83d4c89d9a060871117f8ec8cd72f36c1f3cf3a4
Dianne Hackborn [Mon, 10 Aug 2015 22:30:53 +0000 (22:30 +0000)]
am
d638185d: am
6ae019e7: am
cbfb4c4b: am
fa8a85da: am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
d638185db99b6082327ae0f7fe79b4add436f74f':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 22:21:22 +0000 (22:21 +0000)]
am
6ae019e7: am
cbfb4c4b: am
fa8a85da: am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
6ae019e74b9dcd10fb99fd684c5cd0114cc01ed9':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 22:15:13 +0000 (22:15 +0000)]
am
cbfb4c4b: am
fa8a85da: am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
cbfb4c4bff60c37ca04887a6e9cdd01fcdbf1a67':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 22:07:13 +0000 (22:07 +0000)]
am
fa8a85da: am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
fa8a85da05a9deea9b1ae249a490b63e46058eff':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 22:02:23 +0000 (22:02 +0000)]
am
996e285c: Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
* commit '
996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #
23037720: New Battery Optimization Strings
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
Julia Reynolds [Mon, 10 Aug 2015 21:07:50 +0000 (21:07 +0000)]
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.
Julia Reynolds [Mon, 10 Aug 2015 20:59:29 +0000 (20:59 +0000)]
am
415d6a24: am
f47896d2: am
77dc56bc: am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
415d6a2411edfd72764bfd82208eff6020d85add':
Wrap text on long preferences.
Julia Reynolds [Mon, 10 Aug 2015 20:53:31 +0000 (20:53 +0000)]
am
f47896d2: am
77dc56bc: am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
f47896d223c715a6f480a0c7be36fc1206caf404':
Wrap text on long preferences.
Julia Reynolds [Mon, 10 Aug 2015 20:45:56 +0000 (20:45 +0000)]
am
77dc56bc: am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
77dc56bc4ce29016820dc90fea933324dc57f4be':
Wrap text on long preferences.
Jason Monk [Mon, 10 Aug 2015 20:39:46 +0000 (20:39 +0000)]
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
Julia Reynolds [Mon, 10 Aug 2015 20:37:34 +0000 (20:37 +0000)]
am
2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
* commit '
2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
Jason Monk [Mon, 10 Aug 2015 20:34:04 +0000 (20:34 +0000)]
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
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
Jason Monk [Mon, 10 Aug 2015 20:30:11 +0000 (20:30 +0000)]
am
9614b503: am
a1f64bf2: am
cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit '
9614b50319f8e22640fa43bb3623c41c5f412338':
Remove extra help & feedback menu from power usage
Jason Monk [Mon, 10 Aug 2015 20:21:53 +0000 (20:21 +0000)]
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
Jason Monk [Mon, 10 Aug 2015 20:14:46 +0000 (20:14 +0000)]
am
cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
* commit '
cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage