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
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
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
3b521b60d3
Merge "Battery summary - tint uid 0 icon" into mnc-dev
2015-07-27 18:36:10 +00:00
Jason Monk
9d5907d03e
am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
Update battery optimization strings
2015-07-27 17:57:23 +00:00
Sanket Padawe
9cbb354936
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 17:57:22 +00:00
Julia Reynolds
0b6749614c
am 9a1c0dce
: Handle app uninstall via Storage & USB.
...
* commit '9a1c0dce7a496f51087cf0497b931a31c64b0a65':
Handle app uninstall via Storage & USB.
2015-07-27 17:57:20 +00:00
Jason Monk
08cb39837f
Merge "Update battery optimization strings" into mnc-dev
2015-07-27 17:39:54 +00:00
Sanket Padawe
ca25825152
Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
2015-07-27 17:31:42 +00:00
Jason Monk
5ef0a9e826
Battery summary - tint uid 0 icon
...
Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b
2015-07-27 13:03:42 -04:00
Jason Monk
c9eba1f253
Update battery optimization strings
...
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
2015-07-27 12:29:25 -04:00
Julia Reynolds
9a1c0dce7a
Handle app uninstall via Storage & USB.
...
Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2
2015-07-27 11:13:25 -04:00
Geoff Mendal
a8b7c118f5
am e37e1232
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e37e12321b125731dfff69240b6e49bd00de2a3c':
Import translations. DO NOT MERGE
2015-07-25 00:17:07 +00:00
Geoff Mendal
e37e12321b
Import translations. DO NOT MERGE
...
Change-Id: Ic8304c3f1eb5a71815f72d71854fdcabca7204b8
Auto-generated-cl: translation import
2015-07-24 16:56:10 -07:00
Selim Cinek
01de6ef30a
Autocapitalizing the fingerprint names now
...
Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86
2015-07-24 16:50:16 -07:00
Zach Johnson
356fce4606
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
...
Once they are enabled for the first time, they'll show up indefinitely.
b/22667081
Change-Id: Ia28de99d7d638d54c15fac2e08edeb70a9657e23
2015-07-24 16:46:31 -07:00
Selim Cinek
21574cdb37
Added content description for the fingerprint icon
...
Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804
2015-07-24 16:30:22 -07:00
Adrian Roos
d6dc0bb46a
am 38c9b9eb
: Update FRP warning to spec
...
* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
Update FRP warning to spec
2015-07-24 22:37:48 +00:00
Adrian Roos
38c9b9eb5e
Update FRP warning to spec
...
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
2015-07-24 15:09:34 -07:00
Sanket Padawe
3bf0db8d10
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
2015-07-24 13:52:03 -07:00
Maurice Lam
27165dc3e8
am 36c76014
: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
...
* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
[Fingerprint] Show skip button during SUW
2015-07-24 03:17:09 +00:00
Maurice Lam
36c7601409
Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
2015-07-24 03:08:29 +00:00
Geoff Mendal
61c436d73c
am 5376d54e
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5376d54e8eccc45586e5225b6ec7d6637399270f':
Import translations. DO NOT MERGE
2015-07-24 01:40:16 +00:00
Geoff Mendal
5376d54e8e
Import translations. DO NOT MERGE
...
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
2015-07-23 18:10:24 -07:00
Svetoslav Ganov
6356ee4bcb
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
2015-07-23 22:42:28 +00:00
Jason Monk
06621a57fd
am 8bf5f307
: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
...
* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
Fix battery detail issues with "Android OS"
2015-07-23 22:42:06 +00:00
Jason Monk
5b3921e44a
am 9927acd3
: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
...
* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
Don't show disabled apps in ignore optimizations
2015-07-23 22:42:05 +00:00
Guang Zhu
8a4dda6786
am c1bef743
: Prevent monkey from changing adoptable storage settings
...
* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
Prevent monkey from changing adoptable storage settings
2015-07-23 22:41:48 +00:00
Selim Cinek
b48e9fdcab
Adapted a string in the fingerprint enrollment flow
...
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
2015-07-23 15:29:01 -07:00
Svetoslav Ganov
cce844a7a3
Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
2015-07-23 21:47:10 +00:00
Jason Monk
8bf5f3075e
Merge "Fix battery detail issues with "Android OS"" into mnc-dev
2015-07-23 20:23:57 +00:00
Jason Monk
9927acd3ad
Merge "Don't show disabled apps in ignore optimizations" into mnc-dev
2015-07-23 20:23:09 +00:00
Pavel Zhamaitsiak
8a222530be
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
2015-07-23 18:27:36 +00:00
Jason Monk
e2840f1ce3
am 838c8432
: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
Remove tuner from development settings
2015-07-23 18:27:32 +00:00
Guang Zhu
c1bef7430e
Prevent monkey from changing adoptable storage settings
...
Bug: 22423188
Change-Id: I36c798574c933b0339fad46af81b87a93ccea07b
2015-07-23 10:57:59 -07:00
Pavel Zhamaitsiak
d9e0ed1b3e
Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
2015-07-23 16:54:55 +00:00
Svet Ganov
841bb3d336
Reset permissions and app links when clearing app preferences - settings
...
bug:22359132
Change-Id: I55044a3fd1f8959a2a48cfd02276a24b2f619eb0
2015-07-23 09:40:16 -07:00
Pavel Zhamaitsiak
3e7e2c57d4
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
2015-07-23 09:31:58 -07:00
Maurice Lam
5f8d7dbe52
[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
2015-07-22 16:51:47 -07:00
Maurice Lam
2f2779acce
am 32b96646
: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
[ScreenLock] Style encryption interstitial in SUW
2015-07-22 20:17:37 +00:00
Maurice Lam
9dd92338d0
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
2015-07-22 20:17:34 +00:00
Maurice Lam
899d0a2894
am e44ceed1
: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
[ScreenLock] Update illustration during setup wizard
2015-07-22 20:17:33 +00:00
Jason Monk
838c843217
Merge "Remove tuner from development settings" into mnc-dev
2015-07-22 19:29:59 +00:00
Jason Monk
82f30d2a41
Fix battery detail issues with "Android OS"
...
Bug: 22638215
Change-Id: Ia5bab7eb3bfb964e7f914e8c8f392f4fea66eb29
2015-07-22 10:12:05 -04:00
Maurice Lam
32b96646ee
Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
2015-07-21 23:40:02 +00:00
Maurice Lam
3c1f46dc2c
Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev
2015-07-21 23:39:35 +00:00
Maurice Lam
e44ceed122
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
2015-07-21 23:38:34 +00:00
Jorim Jaggi
f5b17e5588
Move PIN/Pattern appear animation to RenderThread (2/2)
...
Bug: 22205322
Change-Id: Idd16de04701c330b7559bb403316f691a9a717e9
2015-07-21 15:34:26 -07:00
Maurice Lam
da433902d4
[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
2015-07-21 15:23:11 -07:00