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
f299787f32
am 25f86b0f
: am 120ed352
: am b0390ed0
: am de661d5b
: am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit '25f86b0fafc1c9d656ce8aab305137c41662b037':
Fix tap & pay strings.
2015-07-29 11:04:34 +00:00
Martijn Coenen
25f86b0faf
am 120ed352
: am b0390ed0
: am de661d5b
: am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit '120ed352430ae322fa9a5cc79f2c7bf654e2156a':
Fix tap & pay strings.
2015-07-29 10:46:42 +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
274d92467a
am 8e7b9cf9
: Merge "Fix tap & pay strings." into mnc-dev
...
* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
Fix tap & pay strings.
2015-07-29 08:12:07 +00:00
Martijn Coenen
8e7b9cf9f6
Merge "Fix tap & pay strings." into mnc-dev
2015-07-29 07:54:04 +00:00
Zach Johnson
9153a338b7
am b9739da6
: am 0f5373e0
: am b5c146ee
: am ecb19d54
: am a425e864
: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit 'b9739da6d0929d41a6490e99dbeb7abfc1ddaf43':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-29 00:17:17 +00:00
Zach Johnson
b9739da6d0
am 0f5373e0
: am b5c146ee
: am ecb19d54
: am a425e864
: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit '0f5373e0eb2a912407323aaa459a3c55d3037115':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:56:29 +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
4fd8d1e147
am a425e864
: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
...
* commit 'a425e86478b60c4eb1f90f47197fa244379879de':
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 22:57: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
5f4278bdd9
am b5852c60
: am 981ff182
: am 8bdb5561
: am 85bdb773
: am 5b5ed310
: Merge "Prevent crash in app memory updater." into mnc-dev
...
* commit 'b5852c60610014b31a52792762ef120a68468775':
Prevent crash in app memory updater.
2015-07-28 22:05:06 +00:00
Julia Reynolds
639ff84f94
am 3275d302
: am 13a07054
: am 2ade0a5e
: am b7c6306b
: am feeae4cd
: Merge "Hide usage graph on app usage details pages." into mnc-dev
...
* commit '3275d30212196f8d42afb6d455508e345bf544e5':
Hide usage graph on app usage details pages.
2015-07-28 22:05:03 +00:00
Julia Reynolds
b5852c6061
am 981ff182
: am 8bdb5561
: am 85bdb773
: am 5b5ed310
: Merge "Prevent crash in app memory updater." into mnc-dev
...
* commit '981ff1825e74dd391f4b7cdf03032cfbab0d7100':
Prevent crash in app memory updater.
2015-07-28 21:53:01 +00:00
Julia Reynolds
3275d30212
am 13a07054
: am 2ade0a5e
: am b7c6306b
: am feeae4cd
: Merge "Hide usage graph on app usage details pages." into mnc-dev
...
* commit '13a070549d7a38e6b892293eb1ec4f6e52eff2cc':
Hide usage graph on app usage details pages.
2015-07-28 21:53:00 +00:00
Jorim Jaggi
370af761fc
am 6c4a29e5
: am 72f141a5
: am a15cf227
: am 22064d8b
: am 4d9f5c91
: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
...
* commit '6c4a29e5e8c736d53506ef6a84dede2d64ebe3a5':
Don't use screenshot if structure is disabled (2/2)
2015-07-28 21:38:16 +00:00
Jorim Jaggi
6c4a29e5e8
am 72f141a5
: am a15cf227
: am 22064d8b
: am 4d9f5c91
: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
...
* commit '72f141a518426b53295f65836eebb7ecf4316c2d':
Don't use screenshot if structure is disabled (2/2)
2015-07-28 21:18:45 +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
1ae73fafe7
am 5b5ed310
: Merge "Prevent crash in app memory updater." into mnc-dev
...
* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
Prevent crash in app memory updater.
2015-07-28 20:52:50 +00:00
Julia Reynolds
b506392025
am feeae4cd
: Merge "Hide usage graph on app usage details pages." into mnc-dev
...
* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
Hide usage graph on app usage details pages.
2015-07-28 20:52:48 +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
a77130f7e4
am 4d9f5c91
: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
...
* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
Don't use screenshot if structure is disabled (2/2)
2015-07-28 20:08:43 +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
Jorim Jaggi
d3e3c0d697
am e02213db
: am 401453eb
: am bcb0011d
: am afd5a848
: am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit 'e02213db6befe76463ad0031283a3dfd5a8aa0ad':
Fix blank confirm device credential activity
2015-07-28 18:47:17 +00:00
Xiaohui Chen
e43640b376
Merge "sys user split: first pass updating Settings"
2015-07-28 17:39:59 +00: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
Sanket Padawe
e05f714315
Check for special char when renaming device for Wi-Fi direct.
...
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef3
)
2015-07-28 16:09:59 +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
e02213db6b
am 401453eb
: am bcb0011d
: am afd5a848
: am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit '401453eb9fbd9c914181acfe53a9a33f0350e848':
Fix blank confirm device credential activity
2015-07-28 01:33:30 +00: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
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
dcf61a2dfa
Merge "Fix blank confirm device credential activity" into mnc-dev
2015-07-28 00:36:00 +00:00
Xiaohui Chen
44879a387a
sys user split: first pass updating Settings
...
Update various places in Settings to use "admin" ueser flag
instead of checking user id "0". This should be no-op in
single user mode since the only admin user would be user 0.
In split system user mode, this will correctly ACL admin
user instead of non-interactive system user.
Bug: 19913735
Change-Id: Ida4d59c5f689ea0dc34b3b3ff0822b087fa0afd6
2015-07-27 15:39:28 -07:00
Jorim Jaggi
ce6aa489f1
am 07d03c7b
: am 0b555932
: am 33f430ea
: am 935b4444
: am 58d1995c
: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
...
* commit '07d03c7b4b7854eaecb0350c0fa1e9edaba57c45':
Move PIN/Pattern appear animation to RenderThread (2/2)
2015-07-27 20:20:54 +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
Jason Monk
8cead3dbc2
am 0b942cc7
: am 9be8c22f
: am 436a8bbe
: am 3eb14e03
: am 3b521b60
: Merge "Battery summary - tint uid 0 icon" into mnc-dev
...
* commit '0b942cc7c1da41b0a128427a136e667f9e31a776':
Battery summary - tint uid 0 icon
2015-07-27 19:47:35 +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
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
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
Jason Monk
936734f5c1
am 74129926
: am ebefd240
: am f0b615de
: am b322fdf5
: am 08cb3983
: Merge "Update battery optimization strings" into mnc-dev
...
* commit '7412992651fa92ffe68dc4f76f4c7fdc17021614':
Update battery optimization strings
2015-07-27 19:01:39 +00:00
Sanket Padawe
64a5903125
am 98c03dd7
: am 5babd58a
: am f9a6c5bb
: am 970881d9
: am ca258251
: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
...
* commit '98c03dd7d37ed27cc73f1a543c1cc797d6eab71a':
Fix issues in AP dialog arising after clicking on AP preferences.
2015-07-27 19:01:38 +00:00