Julia Reynolds
b7c6306b83
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:54:06 +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
831e3f665a
am 7abb5164
: am 5458688c
: Merge "Make fingerprint error text a live region" into mnc-dev
...
* commit '7abb5164987b812271ac3ba2541e95400834ec70':
Make fingerprint error text a live region
2015-07-28 20:30:43 +00:00
Jorim Jaggi
4d0b9669e8
am f6bdf532
: am 74af384c
: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
...
* commit 'f6bdf5321f7102926da558a50e1ced6897192fd3':
Adjust enrollment UI for sw400 devices
2015-07-28 20:30:41 +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
7abb516498
am 5458688c
: Merge "Make fingerprint error text a live region" into mnc-dev
...
* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
Make fingerprint error text a live region
2015-07-28 20:08:01 +00:00
Jorim Jaggi
f6bdf5321f
am 74af384c
: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
...
* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
Adjust enrollment UI for sw400 devices
2015-07-28 20:08:00 +00:00
Jorim Jaggi
22064d8b89
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:07:58 +00:00
Jorim Jaggi
5458688c1a
Merge "Make fingerprint error text a live region" into mnc-dev
2015-07-28 19:51:03 +00:00
Jorim Jaggi
74af384cae
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
2015-07-28 19:50:47 +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
c19d2be9de
am 2f975b53
: am 1e652aa0
: am e0120a8e
: am cc5c7809
: am 730389bd
: Merge "Adjust choose assist app string" into mnc-dev
...
* commit '2f975b534dd1acd3a2e5414a36e2e25af1586c07':
Adjust choose assist app string
2015-07-28 18:47:21 +00: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
Julia Reynolds
5dadca81eb
Bump string char limit.
...
Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837
2015-07-28 13:39:24 -04: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
Selim Cinek
078d21c7da
am 36b77bc3
: am 6b73c0c6
: am d1c8a612
: am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '36b77bc35d9c7598c3204165964a063f245cf2fa':
Autocapitalizing the fingerprint names now
2015-07-28 03:47:20 +00:00
Selim Cinek
c439427f70
am 1efc5c78
: am a415d016
: am d54849ed
: am ba887301
: am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit '1efc5c7829542640574cdf3228a4c24b75ed41a4':
Added content description for the fingerprint icon
2015-07-28 03:47:19 +00:00
Selim Cinek
b812ead9a8
am e8619653
: am c79a8ee8
: am 73f601d6
: am 01b2d812
: am 95ddf903
: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
...
* commit 'e861965343c8fe4a25d874d1198fef5f7764148c':
Adapted a string in the fingerprint enrollment flow
2015-07-28 03:47:17 +00:00
Jorim Jaggi
2f975b534d
am 1e652aa0
: am e0120a8e
: am cc5c7809
: am 730389bd
: Merge "Adjust choose assist app string" into mnc-dev
...
* commit '1e652aa0d814c13596bf414bd08b13f84f3abee7':
Adjust choose assist app string
2015-07-28 01:33:32 +00: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
1e652aa0d8
am e0120a8e
: am cc5c7809
: am 730389bd
: Merge "Adjust choose assist app string" into mnc-dev
...
* commit 'e0120a8e382b30c72d45c16ce270d580b2be62cd':
Adjust choose assist app string
2015-07-28 01:19:29 +00:00
Jorim Jaggi
401453eb9f
am bcb0011d
: am afd5a848
: am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit 'bcb0011dd9065f868a7b5e75c8ace4fed49aabb8':
Fix blank confirm device credential activity
2015-07-28 01:19:26 +00:00
Jorim Jaggi
e0120a8e38
am cc5c7809
: am 730389bd
: Merge "Adjust choose assist app string" into mnc-dev
...
* commit 'cc5c7809c5062a3539e11d6650a52ed9010dbd8f':
Adjust choose assist app string
2015-07-28 01:06:24 +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
ba435f0ce0
Make fingerprint error text a live region
...
Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d
2015-07-27 18:00:04 -07:00
Jorim Jaggi
cc5c7809c5
am 730389bd
: Merge "Adjust choose assist app string" into mnc-dev
...
* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
Adjust choose assist app string
2015-07-28 00:50:45 +00:00
Jorim Jaggi
afd5a84830
am dcf61a2d
: Merge "Fix blank confirm device credential activity" into mnc-dev
...
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
Fix blank confirm device credential activity
2015-07-28 00:50:44 +00:00
Jorim Jaggi
730389bd82
Merge "Adjust choose assist app string" into mnc-dev
2015-07-28 00:39:12 +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
9b456e5f9d
Adjust enrollment UI for sw400 devices
...
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
2015-07-27 17:31:58 -07: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
Selim Cinek
36b77bc35d
am 6b73c0c6
: am d1c8a612
: am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '6b73c0c678d6bae3167f96991f785614e73252a1':
Autocapitalizing the fingerprint names now
2015-07-27 21:55:34 +00:00
Selim Cinek
1efc5c7829
am a415d016
: am d54849ed
: am ba887301
: am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit 'a415d01657f2e21b33597cf10e4c1136dc47e157':
Added content description for the fingerprint icon
2015-07-27 21:55:33 +00:00
Selim Cinek
e861965343
am c79a8ee8
: am 73f601d6
: am 01b2d812
: am 95ddf903
: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
...
* commit 'c79a8ee8d4df7de6811291cb6bea479090cfb2e5':
Adapted a string in the fingerprint enrollment flow
2015-07-27 21:55:32 +00:00
Jorim Jaggi
66664bea91
Adjust choose assist app string
...
Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
2015-07-27 14:53:48 -07:00
Selim Cinek
6b73c0c678
am d1c8a612
: am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit 'd1c8a6127dde05d95be25a344879945071bb923f':
Autocapitalizing the fingerprint names now
2015-07-27 21:39:04 +00:00
Selim Cinek
a415d01657
am d54849ed
: am ba887301
: am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit 'd54849ed1546b19ab964f1c2854de127f42c50a6':
Added content description for the fingerprint icon
2015-07-27 21:39:02 +00:00
Selim Cinek
c79a8ee8d4
am 73f601d6
: am 01b2d812
: am 95ddf903
: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
...
* commit '73f601d688b85d70cef024bd29bafe2865bb3c29':
Adapted a string in the fingerprint enrollment flow
2015-07-27 21:39:01 +00:00
Selim Cinek
d1c8a6127d
am 34877c40
: am 596ce9ba
: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
...
* commit '34877c4077ebc15220e8830ec1d2a42143dae901':
Autocapitalizing the fingerprint names now
2015-07-27 21:25:12 +00:00
Selim Cinek
d54849ed15
am ba887301
: am a8c7c8c8
: Merge "Added content description for the fingerprint icon" into mnc-dev
...
* commit 'ba88730130ab661ac0608821eed082589ba7d97f':
Added content description for the fingerprint icon
2015-07-27 21:25:09 +00:00
Selim Cinek
73f601d688
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
2015-07-27 21:25:07 +00:00