Jeff Sharkey
b7bea9999c
Merge "Start building SystemApi docs again; exact output." into oc-dev am: ab3c811678
...
am: e9e899f49b
2017-05-10 16:33:34 +00:00
Christine Franks
c5eb0d222e
Merge "Allow ogg files to be selected as ringtones" into oc-dev am: d44afb99c8
...
am: c8ae9d5a60
2017-05-10 16:22:27 +00:00
Julia Reynolds
22dac27cc8
Merge "Rename the legacy notification channel" into oc-dev am: 0c34dc60c4
...
am: 45ba2ef24e
2017-05-10 16:11:39 +00:00
Jeff Sharkey
e9e899f49b
Merge "Start building SystemApi docs again; exact output." into oc-dev
...
am: ab3c811678
2017-05-10 16:10:45 +00:00
Philipp Weiß
d36debb29d
Merge "Implement CACert queries in SecurityController" into oc-dev am: 4c78ac9ce4
...
am: 47d13239c0
2017-05-10 16:08:04 +00:00
Christine Franks
c8ae9d5a60
Merge "Allow ogg files to be selected as ringtones" into oc-dev
...
am: d44afb99c8
2017-05-10 16:04:45 +00:00
Bryce Lee
c8097441e2
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev am: 8a698a1721
...
am: 537ece988a
2017-05-10 16:04:32 +00:00
Daniel Sandler
df13737efb
Merge "Enable notifications during an ongoing call" into oc-dev am: b94abe5e30
...
am: 1201831262
2017-05-10 15:58:38 +00:00
Julia Reynolds
45ba2ef24e
Merge "Rename the legacy notification channel" into oc-dev
...
am: 0c34dc60c4
2017-05-10 15:42:21 +00:00
Julia Reynolds
2a6343bd92
Update zen introduction text am: c12676b449
...
am: 966f6d716f
2017-05-10 15:39:56 +00:00
Philipp Weiß
47d13239c0
Merge "Implement CACert queries in SecurityController" into oc-dev
...
am: 4c78ac9ce4
2017-05-10 15:22:07 +00:00
Tomasz Wasilczyk
b61b618aed
Merge "Implement tune, cancel and getProgramInformation calls of ITuner."
2017-05-10 15:15:20 +00:00
Jeff Sharkey
ab3c811678
Merge "Start building SystemApi docs again; exact output." into oc-dev
2017-05-10 15:05:55 +00:00
Bryce Lee
537ece988a
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
...
am: 8a698a1721
2017-05-10 15:04:05 +00:00
Christine Franks
d44afb99c8
Merge "Allow ogg files to be selected as ringtones" into oc-dev
2017-05-10 15:03:28 +00:00
Todd Kennedy
25a17269b5
Merge "Don't require BROWSABLE" into oc-dev am: 59b9a851a7
...
am: 857bbed067
2017-05-10 15:00:38 +00:00
Daniel Sandler
1201831262
Merge "Enable notifications during an ongoing call" into oc-dev
...
am: b94abe5e30
2017-05-10 15:00:20 +00:00
Geoffrey Pitsch
4629f29acb
Merge "Pre-O apps can see Default Channel name." into oc-dev am: e7fb3c9f26
...
am: b6eedcc811
2017-05-10 14:56:50 +00:00
Julia Reynolds
0c34dc60c4
Merge "Rename the legacy notification channel" into oc-dev
2017-05-10 14:56:25 +00:00
Julia Reynolds
966f6d716f
Update zen introduction text
...
am: c12676b449
2017-05-10 14:53:39 +00:00
Philipp Weiß
4c78ac9ce4
Merge "Implement CACert queries in SecurityController" into oc-dev
2017-05-10 14:46:47 +00:00
Bryce Lee
8a698a1721
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
2017-05-10 14:45:39 +00:00
Daniel Sandler
b94abe5e30
Merge "Enable notifications during an ongoing call" into oc-dev
2017-05-10 14:43:05 +00:00
Todd Kennedy
857bbed067
Merge "Don't require BROWSABLE" into oc-dev
...
am: 59b9a851a7
2017-05-10 14:33:19 +00:00
Geoffrey Pitsch
b6eedcc811
Merge "Pre-O apps can see Default Channel name." into oc-dev
...
am: e7fb3c9f26
2017-05-10 14:27:51 +00:00
TreeHugger Robot
d74dedc24a
Merge "Rounded corners support, off by default."
2017-05-10 14:25:59 +00:00
Julia Reynolds
c12676b449
Update zen introduction text
...
And add alarm text to QS & volume dialog.
Fixes: 31533768
Fixes: 33815404
Test: manual
Change-Id: I82f119a8bdbfbc62b0ace752dca0fbc0d5bf8a35
2017-05-10 14:16:41 +00:00
TreeHugger Robot
59b9a851a7
Merge "Don't require BROWSABLE" into oc-dev
2017-05-10 14:09:13 +00:00
Jorim Jaggi
6970d4707a
Merge "Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am: 56b747fbac" into oc-dev-plus-aosp
...
am: a8c27fb789
2017-05-10 14:06:49 +00:00
TreeHugger Robot
e7fb3c9f26
Merge "Pre-O apps can see Default Channel name." into oc-dev
2017-05-10 14:03:21 +00:00
Jorim Jaggi
6d886dbb9c
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am: 56b747fbac
...
am: 597ee67d61
2017-05-10 14:02:42 +00:00
Android Build Merger (Role)
a8c27fb789
Merge "Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am: 56b747fbac" into oc-dev-plus-aosp
2017-05-10 13:51:23 +00:00
Jorim Jaggi
4f621cc386
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev
...
am: 56b747fbac
2017-05-10 13:46:37 +00:00
Diego Perez
703e04891a
Merge "Removing layout from frameworks/base"
2017-05-10 13:44:36 +00:00
Etan Cohen
b205f4fbc0
Merge "[AWARE] Add is out-of-band utility function"
2017-05-10 13:28:25 +00:00
Jorim Jaggi
597ee67d61
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev
...
am: 56b747fbac
2017-05-10 13:23:40 +00:00
TreeHugger Robot
56b747fbac
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev
2017-05-10 13:13:27 +00:00
Julia Reynolds
c874b9f295
Rename the legacy notification channel
...
Bug: 38120923
Test: make
Change-Id: Id4ee584b1420f98da57350dbc75a6449462a9c24
2017-05-10 12:50:54 +00:00
Jason Monk
d4afe152bf
Rounded corners support, off by default.
...
Test: runtest systemui
Bug: 33208650
Change-Id: I63e11e36268e277cc1c5e70651fa5248aa8b3fc0
2017-05-10 08:27:34 -04:00
Paul Duffin
63e56eff01
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690" into nyc-mr2-dev-plus-aosp am: e4ef5cc1e4
...
am: e0262f787d
2017-05-10 12:26:41 +00:00
Paul Duffin
7e42b4014c
Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690 am: 21a13a84d4
...
am: 4db1f8ec36
2017-05-10 12:23:17 +00:00
Paul Duffin
e0262f787d
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690" into nyc-mr2-dev-plus-aosp
...
am: e4ef5cc1e4
2017-05-10 12:16:25 +00:00
Paul Duffin
4db1f8ec36
Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690
...
am: 21a13a84d4
2017-05-10 12:12:50 +00:00
Android Build Merger (Role)
e4ef5cc1e4
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0 am: e73cd1f690" into nyc-mr2-dev-plus-aosp
2017-05-10 12:04:05 +00:00
Paul Duffin
7bb3532f92
Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0
...
am: e73cd1f690
2017-05-10 11:59:02 +00:00
Paul Duffin
21a13a84d4
Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607f0
...
am: e73cd1f690
2017-05-10 11:48:42 +00:00
Diego Perez
4493b7c429
Removing layout from frameworks/base
...
The directory is being moved to its own project in frameworks/layoutlib
Bug: 36889565
Test: Built manually
Change-Id: I69a1a826d0bac8ede1f9a337c9c1d930bbcd04f3
2017-05-10 12:34:29 +01:00
Paul Duffin
e73cd1f690
Merge "Statically include android.test.runner classes in legacy-android-test"
...
am: 9588b607f0
2017-05-10 11:30:14 +00:00
Jerome Gaillard
13f6a914c2
Merge "Modify font metrics computation to match Android"
2017-05-10 11:22:33 +00:00
Paul Duffin
9588b607f0
Merge "Statically include android.test.runner classes in legacy-android-test"
2017-05-10 11:18:43 +00:00
