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

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

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

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 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

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 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

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

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: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

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 15:13:25 +0000 (11:13 -0400)]

Handle app uninstall via Storage & USB.

Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Jul 2015 14:20:13 +0000 (14:20 +0000)]

am 715b4135: (-s ours) am aeae201d: (-s ours) Import translations. DO NOT MERGE

* commit '715b41355a01d8a5849eb689e20230d966ae9711':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Jul 2015 14:12:29 +0000 (14:12 +0000)]

am aeae201d: (-s ours) Import translations. DO NOT MERGE

* commit 'aeae201ddc52a7f0b9b505e76cd31850e6d82b89':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 27 Jul 2015 13:53:25 +0000 (06:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8535a63ec3b802c8e4440831fb79bc34a7192a0d
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Sat, 25 Jul 2015 16:15:07 +0000 (16:15 +0000)]

am c0d5b79c: (-s ours) am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE

* commit 'c0d5b79c7da6d9c8d5560a76df4674d0e2f59cd3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Sat, 25 Jul 2015 16:15:05 +0000 (16:15 +0000)]

am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec

* commit 'b87428a61d99b920f4e4704709f6f2974346aba8':
Update FRP warning to spec

commit | commitdiff | tree

Geoff Mendal [Sat, 25 Jul 2015 16:15:04 +0000 (16:15 +0000)]

am 48ea7098: (-s ours) am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE

* commit '48ea7098220e8600320143a12d8b0816789300d8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Sat, 25 Jul 2015 15:54:27 +0000 (15:54 +0000)]

am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE

* commit '7b5c7e56553cfe6d8bcca5b56f8f96772b6f98ef':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Sat, 25 Jul 2015 15:54:26 +0000 (15:54 +0000)]

am 5ada0050: am 38c9b9eb: Update FRP warning to spec

* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
Update FRP warning to spec

commit | commitdiff | tree

Geoff Mendal [Sat, 25 Jul 2015 15:53:32 +0000 (15:53 +0000)]

am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE

* commit '92ca0cbe8f0aab2d6efe59f384611275ea8aef00':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Sat, 25 Jul 2015 00:59:51 +0000 (00:59 +0000)]

am e37e1232: (-s ours) Import translations. DO NOT MERGE

* commit 'e37e12321b125731dfff69240b6e49bd00de2a3c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Sat, 25 Jul 2015 00:59:08 +0000 (00:59 +0000)]

am 38c9b9eb: Update FRP warning to spec

* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
Update FRP warning to spec

commit | commitdiff | tree

Geoff Mendal [Sat, 25 Jul 2015 00:09:25 +0000 (17:09 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iee689b96e6d57b9968c5efb133425ca888099d46
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 23:56:10 +0000 (16:56 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic8304c3f1eb5a71815f72d71854fdcabca7204b8
Auto-generated-cl: translation import

commit | commitdiff | tree

Selim Cinek [Fri, 24 Jul 2015 23:50:16 +0000 (16:50 -0700)]

Autocapitalizing the fingerprint names now

Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86

commit | commitdiff | tree

Selim Cinek [Thu, 23 Jul 2015 22:05:38 +0000 (15:05 -0700)]

Added content description for the fingerprint icon

Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804

commit | commitdiff | tree

Adrian Roos [Fri, 24 Jul 2015 18:30:14 +0000 (11:30 -0700)]

Update FRP warning to spec

Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227

commit | commitdiff | tree

Sanket Padawe [Fri, 24 Jul 2015 20:52:03 +0000 (13:52 -0700)]

Fix issues in AP dialog arising after clicking on AP preferences.

+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7

commit | commitdiff | tree

Maurice Lam [Fri, 24 Jul 2015 04:38:06 +0000 (04:38 +0000)]

am 11d1f6d3: am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit '11d1f6d3a135d85511fd5067012c29e4e17b346a':
[Fingerprint] Show skip button during SUW

commit | commitdiff | tree

Maurice Lam [Fri, 24 Jul 2015 03:34:46 +0000 (03:34 +0000)]

am f16673ba: am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
[Fingerprint] Show skip button during SUW

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 03:26:34 +0000 (03:26 +0000)]

am 13cd0b25: (-s ours) am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE

* commit '13cd0b25734e215f3369b0c5367dafdc74c070da':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 03:26:33 +0000 (03:26 +0000)]

am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE

* commit 'cb113be57e3eb49871c77ce5317d644963e033af':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Svetoslav Ganov [Fri, 24 Jul 2015 03:26:31 +0000 (03:26 +0000)]

am 1fa5f4b3: am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

* commit '1fa5f4b33629a8995f44c56b3feb221ef0122477':
Reset permissions and app links when clearing app preferences - settings

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:26:30 +0000 (03:26 +0000)]

am e9b97364: am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit 'e9b97364157c83ed9823f323e2f515bc2e5fc8be':
Fix battery detail issues with "Android OS"

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:26:29 +0000 (03:26 +0000)]

am 9b6ff57e: am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev

* commit '9b6ff57eb550215c30a16225e59a2c4d0af7de92':
Don't show disabled apps in ignore optimizations

commit | commitdiff | tree

Guang Zhu [Fri, 24 Jul 2015 03:26:26 +0000 (03:26 +0000)]

am b91da24d: am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

* commit 'b91da24db774829315087af3af09c90e89f496cb':
Prevent monkey from changing adoptable storage settings

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 24 Jul 2015 03:26:25 +0000 (03:26 +0000)]

am a20eaca1: am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

* commit 'a20eaca1a68138e1077af72bca7f6e76f4332abe':
Add or remove WFC setting when Wireless settings activity is resumed

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:26:23 +0000 (03:26 +0000)]

am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev

* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
Remove tuner from development settings

commit | commitdiff | tree

Maurice Lam [Fri, 24 Jul 2015 03:17:43 +0000 (03:17 +0000)]

am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
[Fingerprint] Show skip button during SUW

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 03:13:06 +0000 (03:13 +0000)]

am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE

* commit 'f305e853a97be420eca536a510d8dca1c9877ef9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 03:13:04 +0000 (03:13 +0000)]

am 28718aeb: (-s ours) Import translations. DO NOT MERGE

* commit '28718aebd187fe68cf923422cde80103b0f6cbca':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Svetoslav Ganov [Fri, 24 Jul 2015 03:10:41 +0000 (03:10 +0000)]

am 6c2d4d73: am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

* commit '6c2d4d73464e6026f42a615c75e3c5d7e3679d7b':
Reset permissions and app links when clearing app preferences - settings

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:10:07 +0000 (03:10 +0000)]

am 14983fc6: am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
Fix battery detail issues with "Android OS"

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:10:05 +0000 (03:10 +0000)]

am a119087b: am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev

* commit 'a119087b8ba24e930d982c30a039f7c4204fc435':
Don't show disabled apps in ignore optimizations

commit | commitdiff | tree

Maurice Lam [Fri, 24 Jul 2015 03:08:29 +0000 (03:08 +0000)]

Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

commit | commitdiff | tree

Guang Zhu [Fri, 24 Jul 2015 03:03:26 +0000 (03:03 +0000)]

am 402c866c: am c1bef743: Prevent monkey from changing adoptable storage settings

* commit '402c866c3117571ddb66614fdbf963e8564a3232':
Prevent monkey from changing adoptable storage settings

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 24 Jul 2015 03:03:24 +0000 (03:03 +0000)]

am bdc3fc36: am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

* commit 'bdc3fc3672df250ea3fd3c8a3b73048ebc232ad4':
Add or remove WFC setting when Wireless settings activity is resumed

commit | commitdiff | tree

Jason Monk [Fri, 24 Jul 2015 03:03:23 +0000 (03:03 +0000)]

am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev

* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
Remove tuner from development settings

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 01:40:16 +0000 (01:40 +0000)]

am 5376d54e: (-s ours) Import translations. DO NOT MERGE

* commit '5376d54e8eccc45586e5225b6ec7d6637399270f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 01:23:19 +0000 (18:23 -0700)]

Import translations. DO NOT MERGE

Change-Id: I52c34f9ee160ac6f8ce81d8922a6d363ca0f348f
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 01:10:24 +0000 (18:10 -0700)]

Import translations. DO NOT MERGE

Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import

commit | commitdiff | tree

Selim Cinek [Thu, 23 Jul 2015 21:46:44 +0000 (14:46 -0700)]

Adapted a string in the fingerprint enrollment flow

Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376