OSDN Git Service
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
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
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
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
Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]
Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]
Merge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]
Adjust choose assist app string
Bug:
22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
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
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
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
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
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
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
Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]
Merge "Added content description for the fingerprint icon" into mnc-dev
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
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)
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)
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
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
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
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
Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]
Merge "Battery summary - tint uid 0 icon" into mnc-dev
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
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.
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.
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
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.
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.
Jason Monk [Mon, 27 Jul 2015 17:39:54 +0000 (17:39 +0000)]
Merge "Update battery optimization strings" into mnc-dev
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
Jason Monk [Mon, 27 Jul 2015 17:03:42 +0000 (13:03 -0400)]
Battery summary - tint uid 0 icon
Bug:
22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b
Jason Monk [Mon, 27 Jul 2015 15:23:15 +0000 (11:23 -0400)]
Update battery optimization strings
Bug:
22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
Julia Reynolds [Mon, 27 Jul 2015 15:13:25 +0000 (11:13 -0400)]
Handle app uninstall via Storage & USB.
Bug:
22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2
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
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
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
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
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
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
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
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
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
Selim Cinek [Fri, 24 Jul 2015 23:50:16 +0000 (16:50 -0700)]
Autocapitalizing the fingerprint names now
Bug:
22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86
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
Adrian Roos [Fri, 24 Jul 2015 18:30:14 +0000 (11:30 -0700)]
Update FRP warning to spec
Bug:
22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
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
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
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
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
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
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
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"
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
Maurice Lam [Fri, 24 Jul 2015 03:08:29 +0000 (03:08 +0000)]
Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
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
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
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
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
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
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
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
Svetoslav Ganov [Thu, 23 Jul 2015 21:56:56 +0000 (21:56 +0000)]
am
cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
* commit '
cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
Reset permissions and app links when clearing app preferences - settings
Svetoslav Ganov [Thu, 23 Jul 2015 21:47:10 +0000 (21:47 +0000)]
Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:32:34 +0000 (20:32 +0000)]
am
8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
* commit '
8bf5f3075e6e0797e96a861330b7ff82eee88bee':
Fix battery detail issues with "Android OS"
Jason Monk [Thu, 23 Jul 2015 20:32:32 +0000 (20:32 +0000)]
am
9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
* commit '
9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
Don't show disabled apps in ignore optimizations
Jason Monk [Thu, 23 Jul 2015 20:23:57 +0000 (20:23 +0000)]
Merge "Fix battery detail issues with "Android OS"" into mnc-dev
Jason Monk [Thu, 23 Jul 2015 20:23:09 +0000 (20:23 +0000)]
Merge "Don't show disabled apps in ignore optimizations" into mnc-dev
Guang Zhu [Thu, 23 Jul 2015 19:32:40 +0000 (19:32 +0000)]
am
c1bef743: Prevent monkey from changing adoptable storage settings
* commit '
c1bef7430e1c49b9c3b2312328d3600261109ee8':
Prevent monkey from changing adoptable storage settings
Maurice Lam [Thu, 23 Jul 2015 19:18:51 +0000 (19:18 +0000)]
am
9b6bd390: am
32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '
9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
[ScreenLock] Style encryption interstitial in SUW
Maurice Lam [Thu, 23 Jul 2015 19:18:50 +0000 (19:18 +0000)]
am
f1fbf9cc: am
3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '
f1fbf9cca44d8a16bc1af92964558cf91ac00161':
[Fingerprint] Send RESULT_CANCELED when back from Add another
Maurice Lam [Thu, 23 Jul 2015 19:18:48 +0000 (19:18 +0000)]
am
ad904de8: am
e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '
ad904de84644ab72754fe7d0cc5a34d1928c03f1':
[ScreenLock] Update illustration during setup wizard
Pavel Zhamaitsiak [Thu, 23 Jul 2015 19:13:06 +0000 (19:13 +0000)]
am
d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
* commit '
d9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
Add or remove WFC setting when Wireless settings activity is resumed
Jason Monk [Thu, 23 Jul 2015 19:13:05 +0000 (19:13 +0000)]
am
838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '
838c843217c76418e5f65b38f40e6b39760de1e4':
Remove tuner from development settings
Guang Zhu [Thu, 23 Jul 2015 17:47:40 +0000 (10:47 -0700)]
Prevent monkey from changing adoptable storage settings
Bug:
22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
Pavel Zhamaitsiak [Thu, 23 Jul 2015 16:54:55 +0000 (16:54 +0000)]
Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
Svet Ganov [Thu, 23 Jul 2015 16:40:13 +0000 (09:40 -0700)]
Reset permissions and app links when clearing app preferences - settings
bug:
22359132
Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
Pavel Zhamaitsiak [Thu, 23 Jul 2015 16:31:58 +0000 (09:31 -0700)]
Add or remove WFC setting when Wireless settings activity is resumed
WFC availability changes when SIM is inserted/removed. Settings
should be updated if this has happened.
Bug:
22642035
Change-Id: I361748440033e703b771175aa79767c53f0da458
Maurice Lam [Wed, 22 Jul 2015 23:03:32 +0000 (16:03 -0700)]
[Fingerprint] Show skip button during SUW
Show a skip button during enrolling in case the user entered the flow
accidentally. The skip button will send the result code RESULT_SKIP,
which is equal to RESULT_FIRST_USER + 1, back to the starting
activity.
Bug:
22666389
Change-Id: I230b04e5150214c31536ac282d56b7b490c85ac1
Maurice Lam [Wed, 22 Jul 2015 20:23:18 +0000 (20:23 +0000)]
am
32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '
32b96646eec917987fdd38208c6b11a9bc8832d3':
[ScreenLock] Style encryption interstitial in SUW
Maurice Lam [Wed, 22 Jul 2015 20:23:17 +0000 (20:23 +0000)]
am
3c1f46dc: Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
* commit '
3c1f46dc2c3d6b0a9c0c39d0cc327380a3f8f078':
[Fingerprint] Send RESULT_CANCELED when back from Add another
Maurice Lam [Wed, 22 Jul 2015 20:23:15 +0000 (20:23 +0000)]
am
e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '
e44ceed122aa06482bf03d58eba91536a29e4158':
[ScreenLock] Update illustration during setup wizard
Jason Monk [Wed, 22 Jul 2015 19:29:59 +0000 (19:29 +0000)]
Merge "Remove tuner from development settings" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 14:12:05 +0000 (10:12 -0400)]
Fix battery detail issues with "Android OS"
Bug:
22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
Geoff Mendal [Wed, 22 Jul 2015 14:10:23 +0000 (14:10 +0000)]
am
0a167c40: (-s ours) Import translations. DO NOT MERGE
* commit '
0a167c400af710fe97d7491abdffbe54bec42761':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Jul 2015 13:59:04 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
Maurice Lam [Tue, 21 Jul 2015 23:40:02 +0000 (23:40 +0000)]
Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:39:35 +0000 (23:39 +0000)]
Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
Maurice Lam [Tue, 21 Jul 2015 23:38:34 +0000 (23:38 +0000)]
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
Jorim Jaggi [Tue, 21 Jul 2015 22:34:26 +0000 (15:34 -0700)]
Move PIN/Pattern appear animation to RenderThread (2/2)
Bug:
22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
Maurice Lam [Fri, 17 Jul 2015 20:16:40 +0000 (13:16 -0700)]
[Fingerprint] Send RESULT_CANCELED when back from Add another
Forward the result in the enrolling screen from the finish screen,
so that if the user presses back in "Add another" after enrolling
the first fingerprint, it will return RESULT_CANCELED instead of
RESULT_FINISHED, and go back to find sensor screen.
This results in the following behavioral changes:
- RESULT_FINISHED will only be sent if the user presses "Done" in
FingerprintEnrollFinish. If the user clicks back in
FingerprintEnrollEnrolling, they will always go back to the
previous screen with RESULT_CANCELED, which would either be
FindSensor or FingerprintSettings.
- If the user presses back in FingerprintEnrollFinish, which is only
possible outside of Setup Wizard, they will be back in Find Sensor,
and pressing next will enroll an additional fingerprint.
- Edge case: if the user enrolled the maximum number of
fingerprints, and presses back, they will be bounced all the way
back to Settings > Security.
Bug:
22552741
Change-Id: Ifc5e8a9150491b4303e01ebd0fc17b6d39dd372d
Billy Lau [Tue, 21 Jul 2015 18:06:42 +0000 (18:06 +0000)]
am
e267fb31: am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
e267fb3119754f205bf8518a6c00d3e957b0e45f':
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 17:54:00 +0000 (17:54 +0000)]
am
d06ba151: Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '
d06ba151f5cc966bf05b2ac0146602d31ae81c4a':
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Billy Lau [Tue, 21 Jul 2015 17:37:05 +0000 (17:37 +0000)]
Merge "Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
Amit Mahajan [Tue, 21 Jul 2015 17:17:45 +0000 (17:17 +0000)]
am
480692fa: am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
480692fab398a080be6648ddf424b3129f2c6cbc':
Fix bug to force to close once change Bearer on APN
Amit Mahajan [Tue, 21 Jul 2015 17:09:12 +0000 (17:09 +0000)]
am
e8357caa: Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
* commit '
e8357caad8880deb23dc04ad5d4d036d41a1ae9f':
Fix bug to force to close once change Bearer on APN
Amit Mahajan [Tue, 21 Jul 2015 16:57:12 +0000 (16:57 +0000)]
Merge "Fix bug to force to close once change Bearer on APN" into mnc-dev
Billy Lau [Tue, 21 Jul 2015 15:43:17 +0000 (16:43 +0100)]
Bug
21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
Overall, fixed the detection of the state of permission in the corresponding
UX to be more accurate. Also ensured that apps needing this capability can
launch the summary UX through a specific intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings.xml:
Increased the CHAR limits for some strings due to requests from translators.
Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
Julia Reynolds [Tue, 21 Jul 2015 15:44:21 +0000 (15:44 +0000)]
am
d409b700: am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
d409b70093211df215bc117ccf9ba8d0924e983f':
Make 'fingerprint' searchable in Settings.
Julia Reynolds [Tue, 21 Jul 2015 15:31:17 +0000 (15:31 +0000)]
am
f516e7dd: Make \'fingerprint\' searchable in Settings.
* commit '
f516e7dde0074416dbf51650cbfb9cc763027b27':
Make 'fingerprint' searchable in Settings.