git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Julia Reynolds [Tue, 28 Jul 2015 22:05:06 +0000 (22:05 +0000)]

am b5852c60: am 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit 'b5852c60610014b31a52792762ef120a68468775':
Prevent crash in app memory updater.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 22:05:03 +0000 (22:05 +0000)]

am 3275d302: am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit '3275d30212196f8d42afb6d455508e345bf544e5':
Hide usage graph on app usage details pages.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 21:53:01 +0000 (21:53 +0000)]

am 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '981ff1825e74dd391f4b7cdf03032cfbab0d7100':
Prevent crash in app memory updater.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 21:53:00 +0000 (21:53 +0000)]

am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit '13a070549d7a38e6b892293eb1ec4f6e52eff2cc':
Hide usage graph on app usage details pages.

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:38:19 +0000 (21:38 +0000)]

am 6922122e: am a67487ee: am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '6922122eb549bdda5382fbcd709cad6be0d012f7':
Make fingerprint error text a live region

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:38:17 +0000 (21:38 +0000)]

am 91f4d549: am f97f7416: am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '91f4d5490d0f9aa86015c565250b2f8d9e2d608b':
Adjust enrollment UI for sw400 devices

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:38:16 +0000 (21:38 +0000)]

am 6c4a29e5: am 72f141a5: am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '6c4a29e5e8c736d53506ef6a84dede2d64ebe3a5':
Don't use screenshot if structure is disabled (2/2)

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 21:37:27 +0000 (21:37 +0000)]

am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '8bdb556174bfb8a903040a5310e3d48f2c4be5bf':
Prevent crash in app memory updater.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 21:37:26 +0000 (21:37 +0000)]

am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit '2ade0a5e7bb52438732555f860f924c0eeacd3c2':
Hide usage graph on app usage details pages.

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:18:47 +0000 (21:18 +0000)]

am a67487ee: am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit 'a67487eed2a5fe8047a3bc8ace53660793c244ff':
Make fingerprint error text a live region

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:18:46 +0000 (21:18 +0000)]

am f97f7416: am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit 'f97f74169362e301c4676d41ac89d5f3330f0651':
Adjust enrollment UI for sw400 devices

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:18:45 +0000 (21:18 +0000)]

am 72f141a5: am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '72f141a518426b53295f65836eebb7ecf4316c2d':
Don't use screenshot if structure is disabled (2/2)

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 21:16:06 +0000 (21:16 +0000)]

am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215':
Prevent crash in app memory updater.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 21:16:03 +0000 (21:16 +0000)]

am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'b7c6306b8322de90e5a620ac5e670216685c7841':
Hide usage graph on app usage details pages.

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:54:38 +0000 (20:54 +0000)]

am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '831e3f665a1f2ea1fa95f6c3a3380713ce9c00b1':
Make fingerprint error text a live region

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:54:36 +0000 (20:54 +0000)]

am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '4d0b9669e8d5813fa61f7515ae3cfc7aca13851b':
Adjust enrollment UI for sw400 devices

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:54:35 +0000 (20:54 +0000)]

am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit 'a15cf2279619a35d1cfe868fb116d90ed0c4a0c8':
Don't use screenshot if structure is disabled (2/2)

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 20:54:07 +0000 (20:54 +0000)]

am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
Prevent crash in app memory updater.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 20:54:06 +0000 (20:54 +0000)]

am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
Hide usage graph on app usage details pages.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]

Merge "Prevent crash in app memory updater." into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 20:32:05 +0000 (20:32 +0000)]

Merge "Hide usage graph on app usage details pages." into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:30:43 +0000 (20:30 +0000)]

am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '7abb5164987b812271ac3ba2541e95400834ec70':
Make fingerprint error text a live region

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:30:41 +0000 (20:30 +0000)]

am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit 'f6bdf5321f7102926da558a50e1ced6897192fd3':
Adjust enrollment UI for sw400 devices

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:30:40 +0000 (20:30 +0000)]

am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '22064d8b89dbe4feb79acff3606540f416bd00a0':
Don't use screenshot if structure is disabled (2/2)

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:08:01 +0000 (20:08 +0000)]

am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
Make fingerprint error text a live region

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:08:00 +0000 (20:08 +0000)]

am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
Adjust enrollment UI for sw400 devices

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 20:07:58 +0000 (20:07 +0000)]

am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
Don't use screenshot if structure is disabled (2/2)

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]

Merge "Make fingerprint error text a live region" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]

Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 19:49:43 +0000 (19:49 +0000)]

Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 19:49:39 +0000 (15:49 -0400)]

Prevent crash in app memory updater.

Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:48:02 +0000 (17:48 -0700)]

Don't use screenshot if structure is disabled (2/2)

Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 18:47:21 +0000 (18:47 +0000)]

am 2f975b53: am 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '2f975b534dd1acd3a2e5414a36e2e25af1586c07':
Adjust choose assist app string

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 18:47:17 +0000 (18:47 +0000)]

am e02213db: am 401453eb: am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'e02213db6befe76463ad0031283a3dfd5a8aa0ad':
Fix blank confirm device credential activity

commit | commitdiff | tree

Xiaohui Chen [Tue, 28 Jul 2015 17:39:59 +0000 (17:39 +0000)]

Merge "sys user split: first pass updating Settings"

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 20:00:06 +0000 (16:00 -0400)]

Hide usage graph on app usage details pages.

Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560

commit | commitdiff | tree

Selim Cinek [Tue, 28 Jul 2015 03:47:20 +0000 (03:47 +0000)]

am 36b77bc3: am 6b73c0c6: am d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '36b77bc35d9c7598c3204165964a063f245cf2fa':
Autocapitalizing the fingerprint names now

commit | commitdiff | tree

Selim Cinek [Tue, 28 Jul 2015 03:47:19 +0000 (03:47 +0000)]

am 1efc5c78: am a415d016: am d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit '1efc5c7829542640574cdf3228a4c24b75ed41a4':
Added content description for the fingerprint icon

commit | commitdiff | tree

Selim Cinek [Tue, 28 Jul 2015 03:47:17 +0000 (03:47 +0000)]

am e8619653: am c79a8ee8: am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit 'e861965343c8fe4a25d874d1198fef5f7764148c':
Adapted a string in the fingerprint enrollment flow

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 01:33:32 +0000 (01:33 +0000)]

am 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '1e652aa0d814c13596bf414bd08b13f84f3abee7':
Adjust choose assist app string

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 01:33:30 +0000 (01:33 +0000)]

am 401453eb: am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit '401453eb9fbd9c914181acfe53a9a33f0350e848':
Fix blank confirm device credential activity

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 01:19:29 +0000 (01:19 +0000)]

am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit 'e0120a8e382b30c72d45c16ce270d580b2be62cd':
Adjust choose assist app string

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 01:19:26 +0000 (01:19 +0000)]

am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'bcb0011dd9065f868a7b5e75c8ace4fed49aabb8':
Fix blank confirm device credential activity

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 01:06:24 +0000 (01:06 +0000)]

am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit 'cc5c7809c5062a3539e11d6650a52ed9010dbd8f':
Adjust choose assist app string

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 01:06:22 +0000 (01:06 +0000)]

am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
Fix blank confirm device credential activity

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:59:05 +0000 (17:59 -0700)]

Make fingerprint error text a live region

Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:50:45 +0000 (00:50 +0000)]

am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
Adjust choose assist app string

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:50:44 +0000 (00:50 +0000)]

am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
Fix blank confirm device credential activity

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]

Merge "Adjust choose assist app string" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]

Merge "Fix blank confirm device credential activity" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:31:23 +0000 (17:31 -0700)]

Adjust enrollment UI for sw400 devices

Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b

commit | commitdiff | tree

Xiaohui Chen [Wed, 22 Jul 2015 20:53:22 +0000 (13:53 -0700)]

sys user split: first pass updating Settings

Update various places in Settings to use "admin" ueser flag
instead of checking user id "0". This should be no-op in
single user mode since the only admin user would be user 0.
In split system user mode, this will correctly ACL admin
user instead of non-interactive system user.

Bug: 19913735
Change-Id: Ida4d59c5f689ea0dc34b3b3ff0822b087fa0afd6

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:55:34 +0000 (21:55 +0000)]

am 6b73c0c6: am d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '6b73c0c678d6bae3167f96991f785614e73252a1':
Autocapitalizing the fingerprint names now

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:55:33 +0000 (21:55 +0000)]

am a415d016: am d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'a415d01657f2e21b33597cf10e4c1136dc47e157':
Added content description for the fingerprint icon

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:55:32 +0000 (21:55 +0000)]

am c79a8ee8: am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit 'c79a8ee8d4df7de6811291cb6bea479090cfb2e5':
Adapted a string in the fingerprint enrollment flow

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]

Adjust choose assist app string

Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:39:04 +0000 (21:39 +0000)]

am d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit 'd1c8a6127dde05d95be25a344879945071bb923f':
Autocapitalizing the fingerprint names now

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:39:02 +0000 (21:39 +0000)]

am d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'd54849ed1546b19ab964f1c2854de127f42c50a6':
Added content description for the fingerprint icon

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:39:01 +0000 (21:39 +0000)]

am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit '73f601d688b85d70cef024bd29bafe2865bb3c29':
Adapted a string in the fingerprint enrollment flow

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:25:12 +0000 (21:25 +0000)]

am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '34877c4077ebc15220e8830ec1d2a42143dae901':
Autocapitalizing the fingerprint names now

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:25:09 +0000 (21:25 +0000)]

am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'ba88730130ab661ac0608821eed082589ba7d97f':
Added content description for the fingerprint icon

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:25:07 +0000 (21:25 +0000)]

am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit '01b2d8124b513643181c50c76b7cdc38c3b404ec':
Adapted a string in the fingerprint enrollment flow

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:11:31 +0000 (21:11 +0000)]

am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
Autocapitalizing the fingerprint names now

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:11:30 +0000 (21:11 +0000)]

am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
Added content description for the fingerprint icon

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 21:11:28 +0000 (21:11 +0000)]

am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit '95ddf903495f97f6d008f8723887228015ed7ead':
Adapted a string in the fingerprint enrollment flow

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]

Merge "Autocapitalizing the fingerprint names now" into mnc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]

Merge "Added content description for the fingerprint icon" into mnc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 20:57:23 +0000 (20:57 +0000)]

Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 20:20:54 +0000 (20:20 +0000)]

am 07d03c7b: am 0b555932: am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '07d03c7b4b7854eaecb0350c0fa1e9edaba57c45':
Move PIN/Pattern appear animation to RenderThread (2/2)

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 19:56:34 +0000 (19:56 +0000)]

am 0b555932: am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '0b55593283c4b919fac21e057ded15dbae17befd':
Move PIN/Pattern appear animation to RenderThread (2/2)

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 19:47:35 +0000 (19:47 +0000)]

am 0b942cc7: am 9be8c22f: am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '0b942cc7c1da41b0a128427a136e667f9e31a776':
Battery summary - tint uid 0 icon

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 19:39:41 +0000 (19:39 +0000)]

am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '33f430ea90ed0b2f315161ef8226eb9459960351':
Move PIN/Pattern appear animation to RenderThread (2/2)

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 19:31:49 +0000 (19:31 +0000)]

am 9be8c22f: am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '9be8c22fbf2a639d0722c585479e496443e2b622':
Battery summary - tint uid 0 icon

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 19:30:29 +0000 (19:30 +0000)]

am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '935b4444160ca816a769faf509a2d6789e5e6651':
Move PIN/Pattern appear animation to RenderThread (2/2)

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 19:18:34 +0000 (19:18 +0000)]

am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '58d1995c904f12dfb00185af3dabfe267d50568a':
Move PIN/Pattern appear animation to RenderThread (2/2)

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 19:18:19 +0000 (19:18 +0000)]

am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '436a8bbeb06acc49562a236d1f41cfe5f6f053e8':
Battery summary - tint uid 0 icon

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 19:04:10 +0000 (19:04 +0000)]

am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '3eb14e0383b15a379bd224cabdebe4e5d7366279':
Battery summary - tint uid 0 icon

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 19:01:39 +0000 (19:01 +0000)]

am 74129926: am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit '7412992651fa92ffe68dc4f76f4c7fdc17021614':
Update battery optimization strings

commit | commitdiff | tree

Sanket Padawe [Mon, 27 Jul 2015 19:01:38 +0000 (19:01 +0000)]

am 98c03dd7: am 5babd58a: am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit '98c03dd7d37ed27cc73f1a543c1cc797d6eab71a':
Fix issues in AP dialog arising after clicking on AP preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 19:01:37 +0000 (19:01 +0000)]

am 96789ed4: am 1f980cb4: am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '96789ed4ccf3c50caa752cc9cdc071a87905fe43':
Handle app uninstall via Storage & USB.

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 18:55:30 +0000 (18:55 +0000)]

Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Fri, 24 Jul 2015 20:03:12 +0000 (13:03 -0700)]

Fix blank confirm device credential activity

Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.

Bug: 22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:51:45 +0000 (18:51 +0000)]

am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
Battery summary - tint uid 0 icon

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:47:32 +0000 (18:47 +0000)]

am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit 'ebefd240b6dd90a5ccc3da8f74cdc42e8c808ba7':
Update battery optimization strings

commit | commitdiff | tree

Sanket Padawe [Mon, 27 Jul 2015 18:47:28 +0000 (18:47 +0000)]

am 5babd58a: am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit '5babd58a516e7227652706e856e15a21743f70b1':
Fix issues in AP dialog arising after clicking on AP preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 18:47:27 +0000 (18:47 +0000)]

am 1f980cb4: am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '1f980cb430b7d15415953ecae35c149a22684730':
Handle app uninstall via Storage & USB.

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:36:36 +0000 (18:36 +0000)]

am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit 'f0b615de0184c740dcaaea75e3f83fde7246d868':
Update battery optimization strings

commit | commitdiff | tree

Sanket Padawe [Mon, 27 Jul 2015 18:36:33 +0000 (18:36 +0000)]

am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit 'f9a6c5bb2f57e69b8c5e4cace754028e5656ed38':
Fix issues in AP dialog arising after clicking on AP preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 18:36:30 +0000 (18:36 +0000)]

am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '82b938c4aeb9522c3d78f904617836e43ea09bf2':
Handle app uninstall via Storage & USB.

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]

Merge "Battery summary - tint uid 0 icon" into mnc-dev

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:19:09 +0000 (18:19 +0000)]

am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
Update battery optimization strings

commit | commitdiff | tree

Sanket Padawe [Mon, 27 Jul 2015 18:19:07 +0000 (18:19 +0000)]

am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit '970881d912f29775bb4063678c98fa77d3186b9b':
Fix issues in AP dialog arising after clicking on AP preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 18:19:06 +0000 (18:19 +0000)]

am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '0c8bee9643717519c7d8ca7888068c7baf07b994':
Handle app uninstall via Storage & USB.

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:06:02 +0000 (18:06 +0000)]

am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
Update battery optimization strings

commit | commitdiff | tree

Sanket Padawe [Mon, 27 Jul 2015 18:06:01 +0000 (18:06 +0000)]

am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit 'ca258251521350421883a79f741ff872103e0ff4':
Fix issues in AP dialog arising after clicking on AP preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 18:06:00 +0000 (18:06 +0000)]

am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '9a1c0dce7a496f51087cf0497b931a31c64b0a65':
Handle app uninstall via Storage & USB.

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 17:39:54 +0000 (17:39 +0000)]

Merge "Update battery optimization strings" into mnc-dev

commit | commitdiff | tree

Sanket Padawe [Mon, 27 Jul 2015 17:31:42 +0000 (17:31 +0000)]

Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 17:03:42 +0000 (13:03 -0400)]

Battery summary - tint uid 0 icon

Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 15:23:15 +0000 (11:23 -0400)]

Update battery optimization strings

Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa