Julia Reynolds
34828da80b
am 96789ed4
: am 1f980cb4
: am 82b938c4
: am 0c8bee96
: am 9a1c0dce
: Handle app uninstall via Storage & USB.
...
* commit '96789ed4ccf3c50caa752cc9cdc071a87905fe43':
Handle app uninstall via Storage & USB.
2015-07-27 19:01:37 +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
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
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
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
Adrian Roos
81ce2ea882
am 2f00f2c8
: am 8fee8176
: am b87428a6
: am 5ada0050
: am 38c9b9eb
: Update FRP warning to spec
...
* commit '2f00f2c84a8e0f99c7ccb35157a63128ec98c19a':
Update FRP warning to spec
2015-07-25 16:54:16 +00:00
Adrian Roos
2f00f2c84a
am 8fee8176
: am b87428a6
: am 5ada0050
: am 38c9b9eb
: Update FRP warning to spec
...
* commit '8fee817698c3a238e3f373eb93f1607cd2cbea0e':
Update FRP warning to spec
2015-07-25 16:37:13 +00:00
Adrian Roos
b87428a61d
am 5ada0050
: am 38c9b9eb
: Update FRP warning to spec
...
* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
Update FRP warning to spec
2015-07-25 15:54:26 +00: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
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
9a946b3cac
am 63c8217b
: am 4ac567ac
: am 11d1f6d3
: am f16673ba
: am 36c76014
: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
...
* commit '63c8217bc95e5f29f0be5a964b45086c84372e35':
[Fingerprint] Show skip button during SUW
2015-07-24 17:21:19 +00:00
Maurice Lam
63c8217bc9
am 4ac567ac
: am 11d1f6d3
: am f16673ba
: am 36c76014
: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
...
* commit '4ac567acce52d09a32e27dcdeacb1f7f899b5c08':
[Fingerprint] Show skip button during SUW
2015-07-24 16:07:00 +00:00
Svetoslav Ganov
c4b467e1f3
am 104c3d3d
: am ea80c4b2
: am 1fa5f4b3
: am 6c2d4d73
: am cce844a7
: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
...
* commit '104c3d3d641f87bd18c35cd2e0d584a515b9fb32':
Reset permissions and app links when clearing app preferences - settings
2015-07-24 04:50:05 +00:00
Jason Monk
47067c7f29
am 6d280250
: am c9607b39
: am e9b97364
: am 14983fc6
: am 8bf5f307
: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
...
* commit '6d2802502cbd69552de7a28c3850ec6d1a75cefc':
Fix battery detail issues with "Android OS"
2015-07-24 04:50:03 +00:00
Jason Monk
39c9460f38
am 5bc0d610
: am c19eac29
: am 9b6ff57e
: am a119087b
: am 9927acd3
: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
...
* commit '5bc0d610ab0dc003afe356a1c8851d668ad2f5d8':
Don't show disabled apps in ignore optimizations
2015-07-24 04:50:02 +00:00
Guang Zhu
5e83b0d9fa
am 29936b07
: am 5ea94a9c
: am b91da24d
: am 402c866c
: am c1bef743
: Prevent monkey from changing adoptable storage settings
...
* commit '29936b072f9d1623b16356b6837d38b7c865cb60':
Prevent monkey from changing adoptable storage settings
2015-07-24 04:50:00 +00:00
Pavel Zhamaitsiak
2fab133a24
am 5d652622
: am ff381a20
: am a20eaca1
: am bdc3fc36
: am d9e0ed1b
: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
...
* commit '5d652622e836738cff848ec4597ddaca92658db5':
Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 04:49:59 +00:00
Colin Cross
dab025bdff
resolved conflicts for merge of 769ba03b
to master
...
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Svetoslav Ganov
104c3d3d64
am ea80c4b2
: am 1fa5f4b3
: am 6c2d4d73
: am cce844a7
: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev
...
* commit 'ea80c4b2512a79e964968e235c85b145a089d3b9':
Reset permissions and app links when clearing app preferences - settings
2015-07-24 03:46:08 +00:00
Jason Monk
6d2802502c
am c9607b39
: am e9b97364
: am 14983fc6
: am 8bf5f307
: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
...
* commit 'c9607b39f8e34b1091f28a27c47fb4dc408fd57c':
Fix battery detail issues with "Android OS"
2015-07-24 03:46:07 +00:00
Jason Monk
5bc0d610ab
am c19eac29
: am 9b6ff57e
: am a119087b
: am 9927acd3
: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev
...
* commit 'c19eac29b6d439644e5fc5dc9504e126c61eb2e7':
Don't show disabled apps in ignore optimizations
2015-07-24 03:46:06 +00:00
Guang Zhu
29936b072f
am 5ea94a9c
: am b91da24d
: am 402c866c
: am c1bef743
: Prevent monkey from changing adoptable storage settings
...
* commit '5ea94a9c4d27d02d989ab8571bde97112bb1747e':
Prevent monkey from changing adoptable storage settings
2015-07-24 03:46:04 +00:00
Pavel Zhamaitsiak
5d652622e8
am ff381a20
: am a20eaca1
: am bdc3fc36
: am d9e0ed1b
: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev
...
* commit 'ff381a20ca92597614f35507b663fdbcf8341cbf':
Add or remove WFC setting when Wireless settings activity is resumed
2015-07-24 03:45:57 +00:00
Jason Monk
769ba03b8f
am 0557f4c3
: am b46b9934
: am 6d8fdb82
: am 838c8432
: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Maurice Lam
11d1f6d3a1
am f16673ba
: am 36c76014
: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
...
* commit 'f16673bab63f950aa5687dc54b83515e35d4755f':
[Fingerprint] Show skip button during SUW
2015-07-24 03:34:46 +00: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
Svetoslav Ganov
1fa5f4b336
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
2015-07-24 03:10:41 +00:00
Jason Monk
e9b9736415
am 14983fc6
: am 8bf5f307
: Merge "Fix battery detail issues with "Android OS"" into mnc-dev
...
* commit '14983fc6646c4012f89903ad76567f53a4b919ba':
Fix battery detail issues with "Android OS"
2015-07-24 03:10:07 +00:00
Jason Monk
9b6ff57eb5
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
2015-07-24 03:10:05 +00:00
Maurice Lam
36c7601409
Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
2015-07-24 03:08:29 +00:00
Guang Zhu
b91da24db7
am 402c866c
: am c1bef743
: Prevent monkey from changing adoptable storage settings
...
* commit '402c866c3117571ddb66614fdbf963e8564a3232':
Prevent monkey from changing adoptable storage settings
2015-07-24 03:03:26 +00:00
Pavel Zhamaitsiak
a20eaca1a6
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
2015-07-24 03:03:24 +00:00
Jason Monk
b46b993403
am 6d8fdb82
: am 838c8432
: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
Remove tuner from development settings
2015-07-24 03:03:23 +00: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