Dianne Hackborn
7e53eb4710
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839 am: c553d79b39
...
am: 6a3fea9e78#28400000 : Settings memory UI still showing z-ram...
Change-Id: I5b66695bc1dbe7c06430277bcd2570a2137376f3
2016-05-12 02:45:20 +00:00
Dianne Hackborn
6a3fea9e78
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev am: 2dec0c7839
...
am: c553d79b39#28400000 : Settings memory UI still showing z-ram...
Change-Id: I8f828474689daad2e300bcb22b3a32b04af1f8fa
2016-05-12 01:12:44 +00:00
Dianne Hackborn
c553d79b39
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
...
am: 2dec0c7839#28400000 : Settings memory UI still showing z-ram...
Change-Id: I6d31dd4cd2dc9c56bb0ee131e7de667d3e5cb6de
2016-05-12 00:51:45 +00:00
Dianne Hackborn
2dec0c7839
Merge "Fix issue #28400000 : Settings memory UI still showing z-ram..." into nyc-dev
2016-05-12 00:40:16 +00:00
Sudheer Shanka
f3d130aab9
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76 am: eeeb02fefb
...
am: 6c3bff4930
2016-05-11 21:51:48 +00:00
Dianne Hackborn
a24b836e85
Fix issue #28400000 : Settings memory UI still showing z-ram...
...
...but probably shouldn't.
Change-Id: I3becb68a9989d915d11439b7beec1fe262261f78
2016-05-11 14:22:05 -07:00
Sudheer Shanka
6c3bff4930
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev am: 938501cf76
...
am: eeeb02fefb
2016-05-11 19:22:24 +00:00
Sudheer Shanka
eeeb02fefb
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
...
am: 938501cf76
2016-05-11 19:14:11 +00:00
Sudheer Shanka
938501cf76
Merge "Add policy transparency to app notification settings on lockscreen." into nyc-dev
2016-05-11 19:04:20 +00:00
Jason Monk
b1e1e9a9fc
Merge "Fix unmount up button" into nyc-dev am: 7680871d92 am: 29b86d10d5
...
am: 60c6b9d252
2016-05-11 18:28:38 +00:00
Jason Monk
60c6b9d252
Merge "Fix unmount up button" into nyc-dev am: 7680871d92
...
am: 29b86d10d5
2016-05-11 18:21:09 +00:00
Jason Monk
29b86d10d5
Merge "Fix unmount up button" into nyc-dev
...
am: 7680871d92
2016-05-11 18:18:37 +00:00
Jason Monk
d88d281304
Merge "Fix unmount up button" into nyc-dev
...
am: 7680871d92
2016-05-11 18:15:38 +00:00
Jason Monk
7680871d92
Merge "Fix unmount up button" into nyc-dev
2016-05-11 18:04:57 +00:00
Jason Monk
0aed68d6b9
Fix unmount up button
...
Change-Id: I24b388079c438075e3a8652822e7a2fb84fec608
Fixes: 28704198
2016-05-11 13:53:13 -04:00
Jason Monk
5df096c381
Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f am: 3b533b98da
...
am: 779584976c
2016-05-11 16:34:01 +00:00
Jason Monk
779584976c
Merge "Fix crash in not installed for this user apps" into nyc-dev am: a188b2447f
...
am: 3b533b98da
2016-05-11 16:31:25 +00:00
Jason Monk
2134be3239
Merge "Fix crash in not installed for this user apps" into nyc-dev
...
am: a188b2447f
2016-05-11 16:28:48 +00:00
Jason Monk
3b533b98da
Merge "Fix crash in not installed for this user apps" into nyc-dev
...
am: a188b2447f
2016-05-11 16:28:48 +00:00
Jason Monk
a188b2447f
Merge "Fix crash in not installed for this user apps" into nyc-dev
2016-05-11 16:19:04 +00:00
Jason Monk
58a561e1e6
Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34 am: b98fd15589
...
am: 637729e246
2016-05-11 15:37:39 +00:00
Jason Monk
637729e246
Merge "Expose dialog for current webview setting." into nyc-dev am: f9e62e8d34
...
am: b98fd15589
2016-05-11 15:35:00 +00:00
Jason Monk
8b4fad811a
Merge "Expose dialog for current webview setting." into nyc-dev
...
am: f9e62e8d34
2016-05-11 15:33:31 +00:00
Jason Monk
bde1a7cfb1
Fix crash in not installed for this user apps
...
Change-Id: I96fa409c5a91cdb6758dbf81714c1c97e28f47b6
Fixes: 28637871
2016-05-11 11:33:04 -04:00
Jason Monk
b98fd15589
Merge "Expose dialog for current webview setting." into nyc-dev
...
am: f9e62e8d34
2016-05-11 15:32:47 +00:00
Jason Monk
f9e62e8d34
Merge "Expose dialog for current webview setting." into nyc-dev
2016-05-11 15:27:37 +00:00
Jason Monk
5c2a9d336b
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8 am: f241ae5fcf
...
am: 2a5b456e69
2016-05-11 15:21:29 +00:00
Jason Monk
7519954286
Expose dialog for current webview setting.
...
Change-Id: I91c796b2c75c0ac8047ba0c2555a1036e8c6c616
Fixes: 28554048
2016-05-11 11:20:55 -04:00
Jason Monk
2a5b456e69
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev am: 76f95e82b8
...
am: f241ae5fcf
2016-05-11 15:18:45 +00:00
Jason Monk
9137eca497
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev
...
am: 76f95e82b8
2016-05-11 15:16:02 +00:00
Jason Monk
f241ae5fcf
Merge "Protect against case when suggestions haven\'t loaded" into nyc-dev
...
am: 76f95e82b8
2016-05-11 15:16:01 +00:00
Jason Monk
76f95e82b8
Merge "Protect against case when suggestions haven't loaded" into nyc-dev
2016-05-11 15:06:05 +00:00
Jason Monk
31ecec0ab1
Protect against case when suggestions haven't loaded
...
Change-Id: I7668ed8af3f1808b619f0fdbd77c2f85da98f607
Fixes: 28691636
2016-05-11 11:01:17 -04:00
Victor Chang
5ef004f76b
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: e8c5eca02d am: bf513e27ae
...
am: ee7ef743f5
2016-05-11 14:58:37 +00:00
Victor Chang
ee7ef743f5
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev am: e8c5eca02d
...
am: bf513e27ae
2016-05-11 14:54:44 +00:00
Victor Chang
bf513e27ae
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
...
am: e8c5eca02d
2016-05-11 14:52:03 +00:00
Victor Chang
38e54ae400
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
...
am: e8c5eca02d
2016-05-11 14:52:02 +00:00
Victor Chang
e8c5eca02d
Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
2016-05-11 14:43:14 +00:00
Jason Monk
df7e87206a
Switch fragments to SettingsPreferenceFragment am: 019aad4c61 am: 7b1c5657d5
...
am: 5dc650fe2d
2016-05-11 14:14:33 +00:00
Jason Monk
5dc650fe2d
Switch fragments to SettingsPreferenceFragment am: 019aad4c61
...
am: 7b1c5657d5
2016-05-11 14:11:54 +00:00
Jason Monk
113762f1dc
Switch fragments to SettingsPreferenceFragment
...
am: 019aad4c61
2016-05-11 14:11:30 +00:00
Jason Monk
7b1c5657d5
Switch fragments to SettingsPreferenceFragment
...
am: 019aad4c61
2016-05-11 14:09:51 +00:00
Victor Chang
01f4dbcc1c
Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
...
- Show ConfirmCredential in TrustedCredentialsSettings when Trust button is clicked
for the very first time since the activity launched
- Warning activity (work mode off, crpyto-aware) should not be shown when the activity is started. Also fixed it here.
Bug: 28619980
Change-Id: I084b70883c087376e437a9ad3238d7c3313a0a17
2016-05-11 15:05:21 +01:00
Jason Monk
019aad4c61
Switch fragments to SettingsPreferenceFragment
...
So all basic settings features are supported properly
Change-Id: I1702272cdbc6c13a5d3ca53840113169a37d4d20
Fixes: 28634520
2016-05-11 10:00:55 -04:00
Jason Monk
e1b9ad424c
Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41 am: b88e4899ff
...
am: 93fc24535b
2016-05-11 13:54:20 +00:00
Jason Monk
93fc24535b
Merge "Fix crash on rotate pointer speed" into nyc-dev am: ab30931d41
...
am: b88e4899ff
2016-05-11 13:49:45 +00:00
Jason Monk
b88e4899ff
Merge "Fix crash on rotate pointer speed" into nyc-dev
...
am: ab30931d41
2016-05-11 13:46:45 +00:00
Jason Monk
7cdfe9a6d8
Merge "Fix crash on rotate pointer speed" into nyc-dev
...
am: ab30931d41
2016-05-11 13:46:42 +00:00
Jason Monk
ab30931d41
Merge "Fix crash on rotate pointer speed" into nyc-dev
2016-05-11 13:36:53 +00:00
Andrew Sapperstein
ac384f47c5
Merge "Add list item to open tips & tricks." into nyc-mr1-dev am: 277b7a81bd
...
am: ebe454e32a
2016-05-10 22:06:15 +00:00
