Jorim Jaggi
afd5a84830
am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
Fix blank confirm device credential activity
2015-07-28 00:50:44 +00:00
Jorim Jaggi
69941efa8b
am 730389bd
: Merge "Adjust choose assist app string" into mnc-dev
...
* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
Adjust choose assist app string
2015-07-28 00:49:25 +00:00
Jorim Jaggi
e4e8bb3486
am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
Fix blank confirm device credential activity
2015-07-28 00:49:23 +00:00
Jorim Jaggi
730389bd82
Merge "Adjust choose assist app string" into mnc-dev
2015-07-28 00:39:12 +00:00
Jorim Jaggi
dcf61a2dfa
Merge "Fix blank confirm device credential activity" into mnc-dev
2015-07-28 00:36:00 +00:00
Jorim Jaggi
9b456e5f9d
Adjust enrollment UI for sw400 devices
...
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
2015-07-27 17:31:58 -07:00
Selim Cinek
36b77bc35d
am 6b73c0c6
: am d1c8a612
: am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '6b73c0c678d6bae3167f96991f785614e73252a1':
Autocapitalizing the fingerprint names now
2015-07-27 21:55:34 +00:00
Selim Cinek
1efc5c7829
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
2015-07-27 21:55:33 +00:00
Selim Cinek
e861965343
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
2015-07-27 21:55:32 +00:00
Jorim Jaggi
66664bea91
Adjust choose assist app string
...
Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
2015-07-27 14:53:48 -07:00
Selim Cinek
6b73c0c678
am d1c8a612
: am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit 'd1c8a6127dde05d95be25a344879945071bb923f':
Autocapitalizing the fingerprint names now
2015-07-27 21:39:04 +00:00
Selim Cinek
a415d01657
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
2015-07-27 21:39:02 +00:00
Selim Cinek
c79a8ee8d4
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
2015-07-27 21:39:01 +00:00
Selim Cinek
d1c8a6127d
am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '34877c4077ebc15220e8830ec1d2a42143dae901':
Autocapitalizing the fingerprint names now
2015-07-27 21:25:12 +00:00
Selim Cinek
d54849ed15
am ba887301
: am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit 'ba88730130ab661ac0608821eed082589ba7d97f':
Added content description for the fingerprint icon
2015-07-27 21:25:09 +00:00
Selim Cinek
73f601d688
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
2015-07-27 21:25:07 +00:00
Selim Cinek
d2b6e1acd0
am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
Autocapitalizing the fingerprint names now
2015-07-27 21:12:05 +00:00
Selim Cinek
412eb5dfde
am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
Added content description for the fingerprint icon
2015-07-27 21:12:04 +00:00
Selim Cinek
e0f552c140
am 95ddf903
: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
...
* commit '95ddf903495f97f6d008f8723887228015ed7ead':
Adapted a string in the fingerprint enrollment flow
2015-07-27 21:12:03 +00:00
Selim Cinek
34877c4077
am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
Autocapitalizing the fingerprint names now
2015-07-27 21:11:31 +00:00
Selim Cinek
ba88730130
am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
Added content description for the fingerprint icon
2015-07-27 21:11:30 +00:00
Selim Cinek
01b2d8124b
am 95ddf903
: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
...
* commit '95ddf903495f97f6d008f8723887228015ed7ead':
Adapted a string in the fingerprint enrollment flow
2015-07-27 21:11:28 +00:00
Selim Cinek
596ce9bab7
Merge "Autocapitalizing the fingerprint names now" into mnc-dev
2015-07-27 20:58:01 +00:00
Selim Cinek
a8c7c8c891
Merge "Added content description for the fingerprint icon" into mnc-dev
2015-07-27 20:57:45 +00:00
Selim Cinek
95ddf90349
Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
2015-07-27 20:57:23 +00:00
Jorim Jaggi
07d03c7b4b
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)
2015-07-27 19:56:34 +00:00
Jorim Jaggi
0b55593283
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)
2015-07-27 19:39:41 +00:00
Jason Monk
0b942cc7c1
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
2015-07-27 19:31:49 +00:00
Fyodor Kupolov
0938a63485
Added android.permission.PEERS_MAC_ADDRESS permission
...
This permission is required for Settings to have access to BT/WiFi scan results
even if location is turned off.
Bug: 21852542
Bug: 22728628
Change-Id: I1b527f78077b45a326fd22d9b4ed92f9f806ff49
2015-07-27 12:31:34 -07:00
Jorim Jaggi
33f430ea90
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)
2015-07-27 19:30:29 +00:00
Jorim Jaggi
935b444416
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)
2015-07-27 19:18:34 +00:00
Jason Monk
9be8c22fbf
am 436a8bbe
: am 3eb14e03
: am 3b521b60
: Merge "Battery summary - tint uid 0 icon" into mnc-dev
...
* commit '436a8bbeb06acc49562a236d1f41cfe5f6f053e8':
Battery summary - tint uid 0 icon
2015-07-27 19:18:19 +00:00
Jorim Jaggi
607e796331
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)
2015-07-27 19:17:20 +00:00
Jason Monk
436a8bbeb0
am 3eb14e03
: am 3b521b60
: Merge "Battery summary - tint uid 0 icon" into mnc-dev
...
* commit '3eb14e0383b15a379bd224cabdebe4e5d7366279':
Battery summary - tint uid 0 icon
2015-07-27 19:04:10 +00:00
Jorim Jaggi
58d1995c90
Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
2015-07-27 18:55:30 +00:00
Jorim Jaggi
35d26096c0
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
2015-07-27 18:53:29 +00:00
Jason Monk
3eb14e0383
am 3b521b60
: Merge "Battery summary - tint uid 0 icon" into mnc-dev
...
* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
Battery summary - tint uid 0 icon
2015-07-27 18:51:45 +00:00
Jason Monk
9a5dc80d05
am 3b521b60
: Merge "Battery summary - tint uid 0 icon" into mnc-dev
...
* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
Battery summary - tint uid 0 icon
2015-07-27 18:48:00 +00:00
Jason Monk
7412992651
am ebefd240
: am f0b615de
: am b322fdf5
: am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit 'ebefd240b6dd90a5ccc3da8f74cdc42e8c808ba7':
Update battery optimization strings
2015-07-27 18:47:32 +00:00
Sanket Padawe
98c03dd7d3
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.
2015-07-27 18:47:28 +00:00
Julia Reynolds
96789ed4cc
am 1f980cb4
: am 82b938c4
: am 0c8bee96
: am 9a1c0dce
: Handle app uninstall via Storage & USB.
...
* commit '1f980cb430b7d15415953ecae35c149a22684730':
Handle app uninstall via Storage & USB.
2015-07-27 18:47:27 +00:00
Jason Monk
ebefd240b6
am f0b615de
: am b322fdf5
: am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit 'f0b615de0184c740dcaaea75e3f83fde7246d868':
Update battery optimization strings
2015-07-27 18:36:36 +00:00
Sanket Padawe
5babd58a51
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.
2015-07-27 18:36:33 +00:00
Julia Reynolds
1f980cb430
am 82b938c4
: am 0c8bee96
: am 9a1c0dce
: Handle app uninstall via Storage & USB.
...
* commit '82b938c4aeb9522c3d78f904617836e43ea09bf2':
Handle app uninstall via Storage & USB.
2015-07-27 18:36:30 +00:00
Jason Monk
3b521b60d3
Merge "Battery summary - tint uid 0 icon" into mnc-dev
2015-07-27 18:36:10 +00:00
Jason Monk
f0b615de01
am b322fdf5
: am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
Update battery optimization strings
2015-07-27 18:19:09 +00:00
Sanket Padawe
f9a6c5bb2f
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.
2015-07-27 18:19:07 +00:00
Julia Reynolds
82b938c4ae
am 0c8bee96
: am 9a1c0dce
: Handle app uninstall via Storage & USB.
...
* commit '0c8bee9643717519c7d8ca7888068c7baf07b994':
Handle app uninstall via Storage & USB.
2015-07-27 18:19:06 +00:00
Jason Monk
b322fdf5b8
am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
Update battery optimization strings
2015-07-27 18:06:02 +00:00
Sanket Padawe
970881d912
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.
2015-07-27 18:06:01 +00:00