Maurice Lam
0ce45dbbe7
am 1df9a7cc
: am 3760e5e7
: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
...
* commit '1df9a7cc16a9dd9892b633aad4ec246677d2c6b5':
[ZenMode] Align text to viewStart in remove dialog
2015-07-29 18:53:41 +00:00
Maurice Lam
3760e5e7e4
Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
2015-07-29 18:25:48 +00:00
Chris Wren
59f07cc7c8
am cb176a41
: am 2a56d7f2
: Merge "fix InactiveApps instrumentation" into mnc-dev
...
* commit 'cb176a41ad0ac94a65ed13bf1e18242f8220bd5b':
fix InactiveApps instrumentation
2015-07-29 16:26:32 +00:00
Chris Wren
2a56d7f23b
Merge "fix InactiveApps instrumentation" into mnc-dev
2015-07-29 14:57:14 +00:00
Julia Reynolds
1990f8f722
am cb91edae
: am 300d6fd9
: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
...
* commit 'cb91edaeb2fd9bdf8a77a994c4767fac808bbe36':
Use pattern visibility setting on confirm pattern screen.
2015-07-29 13:00:27 +00:00
Julia Reynolds
300d6fd90c
Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
2015-07-29 12:25:54 +00:00
Martijn Coenen
b0390ed0e5
am de661d5b
: am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
Fix tap & pay strings.
2015-07-29 10:06:07 +00:00
Martijn Coenen
8e7b9cf9f6
Merge "Fix tap & pay strings." into mnc-dev
2015-07-29 07:54:04 +00:00
Zach Johnson
b5c146eef9
am ecb19d54
: am a425e864
: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit 'ecb19d540025a6c1855d148f1b4015f3a107bfd1':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:18:57 +00:00
Zach Johnson
a425e86478
Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
2015-07-28 22:36:31 +00:00
Julia Reynolds
8bdb556174
am 85bdb773
: am 5b5ed310
: Merge "Prevent crash in app memory updater." into mnc-dev
...
* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215':
Prevent crash in app memory updater.
2015-07-28 21:16:06 +00:00
Julia Reynolds
2ade0a5e7b
am b7c6306b
: am feeae4cd
: Merge "Hide usage graph on app usage details pages." into mnc-dev
...
* commit 'b7c6306b8322de90e5a620ac5e670216685c7841':
Hide usage graph on app usage details pages.
2015-07-28 21:16:03 +00:00
Julia Reynolds
5b5ed310d4
Merge "Prevent crash in app memory updater." into mnc-dev
2015-07-28 20:32:08 +00:00
Julia Reynolds
feeae4cdeb
Merge "Hide usage graph on app usage details pages." into mnc-dev
2015-07-28 20:32:05 +00:00
Jorim Jaggi
a15cf22796
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)
2015-07-28 20:30:40 +00:00
Jorim Jaggi
4d9f5c91ae
Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev
2015-07-28 19:49:43 +00:00
Julia Reynolds
ed91bbdb1f
Prevent crash in app memory updater.
...
Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d
2015-07-28 15:49:39 -04:00
Jorim Jaggi
e32c17580e
Don't use screenshot if structure is disabled (2/2)
...
Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
2015-07-28 12:07:10 -07:00
Maurice Lam
b01383beab
[ZenMode] Align text to viewStart in remove dialog
...
Bug: 22274462
Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40
2015-07-28 10:38:52 -07:00
Chris Wren
f464a9a4a4
fix InactiveApps instrumentation
...
Bug: 21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c
2015-07-28 16:56:22 +00:00
Martijn Coenen
b637ba08ad
Fix tap & pay strings.
...
Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
2015-07-28 16:37:39 +02:00
Julia Reynolds
36a38c95d5
Use pattern visibility setting on confirm pattern screen.
...
Bug: 22683055
Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3
2015-07-28 10:14:07 -04:00
Julia Reynolds
1740ce4f0c
Hide usage graph on app usage details pages.
...
Also make the back button work properly on these pages.
Bug: 22691655
Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560
2015-07-28 10:03:13 -04:00
Jorim Jaggi
bcb0011dd9
am afd5a848
: am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
Fix blank confirm device credential activity
2015-07-28 01:06:22 +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
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
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
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
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
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
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
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
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