Ricky Wai
03a592c5ea
Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev am: 4a314fc
...
am: a71beeb
* commit 'a71beeb7fd76bcc0e0a7a018c3387619ee541a27':
Show "work mode off" dialog when work security option is clicked
Change-Id: I2178097b9b0ef3d8868ff3aafc488b220656245e
2016-04-13 10:11:57 +00:00
Ricky Wai
c828849403
Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev am: 4f19945
...
am: 0710a4c
* commit '0710a4c96dcfa9684535fd67e2b5b81d3fc3e88d':
Unified work lock checkbox should roll back when user cancels confirm dialog
Change-Id: Ifb3574fc80edb75662baa275b537761c574f6605
2016-04-13 10:11:57 +00:00
Ricky Wai
a71beeb7fd
Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev
...
am: 4a314fc
* commit '4a314fc3caa3db8220f2192dd9f3f54144aaa0b0':
Show "work mode off" dialog when work security option is clicked
Change-Id: I1418b2112f91cc6f02a00e7091520aab3006b067
2016-04-13 10:08:37 +00:00
Ricky Wai
0710a4c96d
Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev
...
am: 4f19945
* commit '4f1994598ba27907614d381d2792508367a05131':
Unified work lock checkbox should roll back when user cancels confirm dialog
Change-Id: Ie83daa2b232ddd6a7f733ddb8b9f0f733d62bccb
2016-04-13 10:08:37 +00:00
Ricky Wai
4a314fc3ca
Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev
2016-04-13 10:04:52 +00:00
Ricky Wai
4f1994598b
Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev
2016-04-13 10:04:23 +00:00
Ricky Wai
616342bb94
Show "work mode off" dialog when work security option is clicked
...
Bug: 28158297
Change-Id: I31bc3197d2ff9c95419ea87d009fe7d677181d69
2016-04-13 10:03:31 +00:00
Nicolas Prévot
b1a41697dd
Merge "Show the right icon and label for work profile in data usage." into nyc-dev am: a3d18c0
...
am: 51ecf5c
* commit '51ecf5c8b202f35cacbc6d5bb9f04b7b30dca34e':
Show the right icon and label for work profile in data usage.
Change-Id: Ieae26b3f83854d63d322200f0a2038db1976a7ce
2016-04-13 08:34:54 +00:00
Nicolas Prevot
51ecf5c8b2
Merge "Show the right icon and label for work profile in data usage." into nyc-dev
...
am: a3d18c0
* commit 'a3d18c03e88cf9dda086a843a2dbf1bf4dc0b146':
Show the right icon and label for work profile in data usage.
Change-Id: I2c82cf2ce6878f0127afba07ee9a73078b07b030
2016-04-13 08:31:40 +00:00
Nicolas Prévot
a3d18c03e8
Merge "Show the right icon and label for work profile in data usage." into nyc-dev
2016-04-13 08:22:10 +00:00
Nathan Harold
709846a099
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev am: 0887ace
...
am: 69f68de
* commit '69f68debd59c24857662ffb34178d03742cb6dac':
Minor Fixes for RadioInfo Test Menu
Change-Id: I4307f76190e470c4d57f247de018445d9183a6e8
2016-04-13 07:46:34 +00:00
Nathan Harold
69f68debd5
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
...
am: 0887ace
* commit '0887ace34472469003299d782b90c8fd9324bb7e':
Minor Fixes for RadioInfo Test Menu
Change-Id: Ia7d06a94f81e5f27500bf63a16d95dad6f8d8829
2016-04-13 07:43:23 +00:00
Nathan Harold
0887ace344
Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
2016-04-13 07:37:38 +00:00
Nathan Harold
ed38afafd8
Minor Fixes for RadioInfo Test Menu
...
-Fix a race condition in re-creating activity
-Ensure cell info is disabled when Menu is paused
-Fix issue with focus on creating view
Change-Id: Icfb7667fe6e47ab6dc950918447bbe892e0681ad
2016-04-13 00:29:38 -07:00
TreeHugger Robot
297b45f35a
Merge "Clearing cache for managed profile apps" into nyc-dev am: 490e40e
...
am: b8b8fc2
* commit 'b8b8fc2fe5fd33e5f7b6a139c79bfd51e8ec0cd5':
Clearing cache for managed profile apps
Change-Id: I4e6abe0faa6f91deccb8ceca3a38460bf2e61687
2016-04-13 03:25:20 +00:00
Suprabh Shukla
b8b8fc2fe5
Merge "Clearing cache for managed profile apps" into nyc-dev
...
am: 490e40e
* commit '490e40ecc842c2d333657951fd45bea358c816a5':
Clearing cache for managed profile apps
Change-Id: Id74948c6b55f9b27f8bdcf0ee3cf0fdee323ca0d
2016-04-13 03:22:27 +00:00
TreeHugger Robot
490e40ecc8
Merge "Clearing cache for managed profile apps" into nyc-dev
2016-04-13 03:13:48 +00:00
Chris Wren
285ad580df
Merge "update station to show ranking and autobundles" into nyc-dev am: 106d8e5
...
am: 7b4a9dc
* commit '7b4a9dc9ccf44aa738c1cb1834c593c91db383e6':
update station to show ranking and autobundles
Change-Id: I049fa6fe4746532547d0c7f65a9c603c50e6dbb5
2016-04-13 00:33:25 +00:00
Jason Monk
698ef83e0c
Merge "Guard against empty extraInfo" into nyc-dev am: b63a4f8
...
am: de27b15
* commit 'de27b15329e11a9787bead8560d08b530bdce089':
Guard against empty extraInfo
Change-Id: I4ddf00b0d159e8c085049f9566f19433e4a2fc8c
2016-04-13 00:33:25 +00:00
Jason Monk
664033d46f
Merge "Work on settings startup speed" into nyc-dev am: 1fd25b9
...
am: 3d4b96a
-s ours
* commit '3d4b96a46ffd44e0bc769eda90bf37043866cca2':
Work on settings startup speed
Change-Id: Iaf559a57f57c2ec0bfd3e9a2d8caeb8882fcb936
2016-04-13 00:33:24 +00:00
Suprabh Shukla
3f4ac54c77
Clearing cache for managed profile apps
...
Added code to loop over all the child profiles and delete application
cache files for them, when clearing cache from Settings->Storage
Bug: b/25338468
Change-Id: I87dba56218402be44b71a009e93b2e93f48a574c
2016-04-12 16:47:08 -07:00
Jason Monk
2531963171
Merge "Disable animations for bluetooth." into nyc-dev am: 90886f6
...
am: b1a1722
* commit 'b1a172222834d1935f6418420c1f7e820e030463':
Disable animations for bluetooth.
Change-Id: I2d99956f648d120798c073484db10e4684c6201a
2016-04-12 23:40:50 +00:00
Chris Wren
7b4a9dc9cc
Merge "update station to show ranking and autobundles" into nyc-dev
...
am: 106d8e5
* commit '106d8e57cee93afbd25587b75455ec78f1853271':
update station to show ranking and autobundles
Change-Id: I7eb816701684c9d48e450d3f01046eece3c3d5b2
2016-04-12 22:44:49 +00:00
Jason Monk
de27b15329
Merge "Guard against empty extraInfo" into nyc-dev
...
am: b63a4f8
* commit 'b63a4f87416bcf3170411fc336529ca8f5d14626':
Guard against empty extraInfo
Change-Id: Iea0c1172f484554a16d8c718b24f02e9e315ac0e
2016-04-12 22:44:49 +00:00
Jason Monk
3d4b96a46f
Merge "Work on settings startup speed" into nyc-dev
...
am: 1fd25b9
* commit '1fd25b982a5d80a13b4e34e2c3130dd2d7f856a6':
Work on settings startup speed
Change-Id: Ib1ba9c56085a3a18e691bdda63a62528e0a829e3
2016-04-12 22:44:49 +00:00
Jason Monk
b1a1722228
Merge "Disable animations for bluetooth." into nyc-dev
...
am: 90886f6
* commit '90886f66f6c27ed3c67c32983aa0214e521e2d24':
Disable animations for bluetooth.
Change-Id: I7325068e38900c7f1a16a1a8685a941ecc12707b
2016-04-12 22:44:48 +00:00
Chris Wren
106d8e57ce
Merge "update station to show ranking and autobundles" into nyc-dev
2016-04-12 21:02:15 +00:00
Jason Monk
b63a4f8741
Merge "Guard against empty extraInfo" into nyc-dev
2016-04-12 20:11:17 +00:00
Jason Monk
1fd25b982a
Merge "Work on settings startup speed" into nyc-dev
2016-04-12 20:11:00 +00:00
Jason Monk
9a6349a4d5
Guard against empty extraInfo
...
Change-Id: Iff297637edd3ebf5b6d26bc1dc51e9c17393e24f
Fixes: 27999693
2016-04-12 16:03:39 -04:00
Nicolas Prevot
cda955072d
Show the right icon and label for work profile in data usage.
...
Previously, it showed the icon and label of a random application.
BUG:26798809
Change-Id: I9d812943bdf6f99e87dfd9bb4a37b25644b8d18d
2016-04-12 20:29:22 +01:00
Jason Monk
5673ced93c
Work on settings startup speed
...
- Cut down on amount stored in conditions xml
- Remove extra work from dashboard startup
- Move summary to min priority
Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes: 28134360
2016-04-12 15:19:50 -04:00
Jason Monk
90886f66f6
Merge "Disable animations for bluetooth." into nyc-dev
2016-04-12 19:18:47 +00:00
Jason Monk
f96916606d
Merge "Add demo mode to dev options" into nyc-dev am: 7b5c400
...
am: 2230710
* commit '2230710d319745294f44b696d09301f15f281493':
Add demo mode to dev options
Change-Id: I54c5a963461127e04f7169ecc90ba367f4883dd1
2016-04-12 19:14:37 +00:00
Jason Monk
2230710d31
Merge "Add demo mode to dev options" into nyc-dev
...
am: 7b5c400
* commit '7b5c4007e224a00933029f9874d7d830b8a70742':
Add demo mode to dev options
Change-Id: I48eefd0ae371f09f8841b1aaa113cea7e208a5a9
2016-04-12 19:07:47 +00:00
Sudheer Shanka
ed277a1005
Merge "Auto-link web urls in support messages." into nyc-dev am: 67d068e
...
am: 6cd4555
* commit '6cd4555ac4577a025fab54a09907290398f52207':
Auto-link web urls in support messages.
Change-Id: I891fb47cf6c1ff220d5cf9c90d9f4fe12fcf3d1e
2016-04-12 18:55:49 +00:00
Felipe Leme
45f003291b
Merge "Make "Take bugreport" dialog scrollable." into nyc-dev am: 5cbac88
...
am: 0b2a97f
* commit '0b2a97fa5a6318214f8c227f863191119966f144':
Make "Take bugreport" dialog scrollable.
Change-Id: I2b8b541d51cf7ba47209086c85a460b55b5455a3
2016-04-12 18:55:48 +00:00
Noah Wang
2a1e94aeb1
Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev am: 0d03c3b
...
am: e362ed3
* commit 'e362ed3267dcecc50364b734c3237481f6a6d3c1':
Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511
Change-Id: Ia3b26bc7e848ea01de9abf6f83b0e27fbcec7363
2016-04-12 18:55:48 +00:00
Noah Wang
f1a3511363
Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332" into nyc-dev am: 858a1c6
...
am: d9c591b
* commit 'd9c591bda00ec7576aecd890083e30162d6277dd':
Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332
Change-Id: I33bfa8255604141f6950c38e01413fc4ba69d068
2016-04-12 18:55:47 +00:00
Jorim Jaggi
918dbcb0d4
Merge "Always update value of screenshot preference" into nyc-dev am: 0493422
...
am: 0df85e3
* commit '0df85e3e235e666b4122a77acfb3ff8fea0bd375':
Always update value of screenshot preference
Change-Id: I6bb2472b151626d1a5a946e6cbb659e0dc64da07
2016-04-12 18:55:47 +00:00
Udam Saini
c72a8de8dc
Merge "Increase string char limit." into nyc-dev am: 7f6ba63
...
am: 0ec0ffd
* commit '0ec0ffde587d87edffb75bf5ffae4a2024b2409a':
Increase string char limit.
Change-Id: I60961d02c21bc409996ac100ba6d5fff1f6194cc
2016-04-12 18:55:46 +00:00
Jason Monk
7b5c4007e2
Merge "Add demo mode to dev options" into nyc-dev
2016-04-12 18:53:18 +00:00
Sudheer Shanka
6cd4555ac4
Merge "Auto-link web urls in support messages." into nyc-dev
...
am: 67d068e
* commit '67d068e57749fa82ec54794d616a10e0e0a592b1':
Auto-link web urls in support messages.
Change-Id: I28f26bc84e009c7a199ef9cead16cdbb92d1018c
2016-04-12 18:50:28 +00:00
Felipe Leme
0b2a97fa5a
Merge "Make "Take bugreport" dialog scrollable." into nyc-dev
...
am: 5cbac88
* commit '5cbac8884118d8618da7af4a3a42d7b67bcdb77e':
Make "Take bugreport" dialog scrollable.
Change-Id: I8e6e3ddb2a96b2fd12756794d39aa275a9e6c98a
2016-04-12 18:50:27 +00:00
Noah Wang
e362ed3267
Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev
...
am: 0d03c3b
* commit '0d03c3b524181dd5a6dc0e8db734f1cb32ed8745':
Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511
Change-Id: I2924e7bd2d26c0b56815ca2dd879e375ae94f48f
2016-04-12 18:50:27 +00:00
Noah Wang
d9c591bda0
Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332" into nyc-dev
...
am: 858a1c6
* commit '858a1c6f202865641c2f79fb919c13c2ae8c6f1a':
Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332
Change-Id: If3caec0fe2bc386b650c6e6f7f6ab3d73ec96b10
2016-04-12 18:50:27 +00:00
Jorim Jaggi
0df85e3e23
Merge "Always update value of screenshot preference" into nyc-dev
...
am: 0493422
* commit '0493422de2a6c1f6ed5443ac6ebaa72fc844cef4':
Always update value of screenshot preference
Change-Id: I9d00cfce4dbd8b9baf8aa4ce103e6dcd11c5496a
2016-04-12 18:50:26 +00:00
Udam Saini
0ec0ffde58
Merge "Increase string char limit." into nyc-dev
...
am: 7f6ba63
* commit '7f6ba63fcf7692bec0af1a5eec3fe1e77e58a9f9':
Increase string char limit.
Change-Id: I6ca7f13286ef630b0770b7e67d4ebea8d9d1f395
2016-04-12 18:50:25 +00:00
Jason Monk
ac06fed1d2
Disable animations for bluetooth.
...
Change-Id: I2aa77d8ce91f81b6704b4f91766ee61c79afb2f8
Fixes: 28135206
2016-04-12 14:45:41 -04:00
Sudheer Shanka
67d068e577
Merge "Auto-link web urls in support messages." into nyc-dev
2016-04-12 18:44:40 +00:00