OSDN Git Service
Philip P. Moltmann [Mon, 2 May 2016 16:03:47 +0000 (16:03 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev am:
8582909cae
am:
cb60c8bf21
* commit '
cb60c8bf219f5a8423ffa69962a575ce8f8cfa9d':
Visibility of pageRangeTitle =!= pageRangeText
Change-Id: Ib1a22025796e4a8ee097e491c8a643b48fa82707
Philip P. Moltmann [Mon, 2 May 2016 16:03:41 +0000 (16:03 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev am:
1f113db350
am:
1679077c48
* commit '
1679077c48609604792f6c64fcb48d246b517c37':
Delay callback from printerRegistry after Constr.
Change-Id: I7d5f46ca757f8b37e1e637c3ed87838467e65e72
Philip P. Moltmann [Mon, 2 May 2016 15:59:01 +0000 (15:59 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev
am:
8582909cae
* commit '
8582909caefe952d02889e239642af945f64c03d':
Visibility of pageRangeTitle =!= pageRangeText
Change-Id: I89a018d8c3fa6394e8c4af93feab2463815fd2d7
Philip P. Moltmann [Mon, 2 May 2016 15:58:58 +0000 (15:58 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev
am:
1f113db350
* commit '
1f113db35095c8f43b702991dd68edc1ce398c82':
Delay callback from printerRegistry after Constr.
Change-Id: I7fbea2dc9cef8c37889616ac1ac694f253adf533
Philip P. Moltmann [Mon, 2 May 2016 15:49:59 +0000 (15:49 +0000)]
Merge "Visibility of pageRangeTitle =!= pageRangeText" into nyc-dev
Philip P. Moltmann [Mon, 2 May 2016 15:49:47 +0000 (15:49 +0000)]
Merge "Delay callback from printerRegistry after Constr." into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 15:00:40 +0000 (15:00 +0000)]
Merge "Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e am:
0a583debd4" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Mon, 2 May 2016 15:00:12 +0000 (15:00 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e
am:
0a583debd4
* commit '
0a583debd419d1db3a1c894f6fec47f0294e257d':
Change-Id: I77289bb83f9568a797d0daa005a60a3f8138d81c
Android Build Merger (Role) [Mon, 2 May 2016 14:56:56 +0000 (14:56 +0000)]
Merge "Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e am:
0a583debd4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 14:56:50 +0000 (14:56 +0000)]
Merge "Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e am:
f2f1b43a1a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 May 2016 14:56:44 +0000 (14:56 +0000)]
Merge "Merge "Restrict updates of system packages" into nyc-dev am:
4e4fca43b0 am:
67cc0b2b8f" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Mon, 2 May 2016 14:56:12 +0000 (14:56 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e
am:
0a583debd4
* commit '
0a583debd419d1db3a1c894f6fec47f0294e257d':
Don't move stack to front when creating a task for activity to be started
Change-Id: I1f42f0a0acf1cdc169f445da5ce4f5f2344671a4
Wale Ogunwale [Mon, 2 May 2016 14:56:08 +0000 (14:56 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev am:
a092aa436e
am:
f2f1b43a1a
* commit '
f2f1b43a1adc46cfa05d6f79a0ef469c0371c3bb':
Don't move stack to front when creating a task for activity to be started
Change-Id: I950063df448040b5618a9e68ebe41e9cad6cb305
Todd Kennedy [Mon, 2 May 2016 14:56:08 +0000 (14:56 +0000)]
Merge "Restrict updates of system packages" into nyc-dev am:
4e4fca43b0
am:
67cc0b2b8f
* commit '
67cc0b2b8f57c0dafded9b0c65f3cc54c27348aa':
Restrict updates of system packages
Change-Id: I964876246e334cab6cfdc097d7f8a6ad479565a5
Todd Kennedy [Mon, 2 May 2016 14:56:05 +0000 (14:56 +0000)]
Merge "Restrict updates of system packages" into nyc-dev am:
4e4fca43b0
am:
728b0978e5
* commit '
728b0978e5112f28b63ea8ff4a37bc14410a0813':
Restrict updates of system packages
Change-Id: Ic1a09e63e17f00b3ce38bd340c69cb416101a154
Wale Ogunwale [Mon, 2 May 2016 14:52:03 +0000 (14:52 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev
am:
a092aa436e
* commit '
a092aa436eb1eaa0c9606a0a395f3b52ad9cccef':
Don't move stack to front when creating a task for activity to be started
Change-Id: Iba15accd2d7c97ee799fd1cf27206d88300ab06f
Wale Ogunwale [Mon, 2 May 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Don\'t move stack to front when creating a task for activity to be started" into nyc-dev
am:
a092aa436e
* commit '
a092aa436eb1eaa0c9606a0a395f3b52ad9cccef':
Don't move stack to front when creating a task for activity to be started
Change-Id: I03cd1bd5764a90f91379663db31594c5af0e8d70
Todd Kennedy [Mon, 2 May 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Restrict updates of system packages" into nyc-dev
am:
4e4fca43b0
* commit '
4e4fca43b0fb1320ce0265640d33b700cd886da8':
Restrict updates of system packages
Change-Id: Ifbfdbcc9056fddbd41ea6d690441cb3805f7c3ff
Todd Kennedy [Mon, 2 May 2016 14:51:57 +0000 (14:51 +0000)]
Merge "Restrict updates of system packages" into nyc-dev
am:
4e4fca43b0
* commit '
4e4fca43b0fb1320ce0265640d33b700cd886da8':
Restrict updates of system packages
Change-Id: Ie6e530365b1b805091f60ca4c5a3a2b1701409ca
Wale Ogunwale [Mon, 2 May 2016 14:46:37 +0000 (14:46 +0000)]
Merge "Don't move stack to front when creating a task for activity to be started" into nyc-dev
Todd Kennedy [Mon, 2 May 2016 14:44:18 +0000 (14:44 +0000)]
Merge "Restrict updates of system packages" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 14:35:00 +0000 (14:35 +0000)]
Merge "Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506 am:
700c64200e" into nyc-mr1-dev-plus-aosp
Nadia Benbernou [Mon, 2 May 2016 14:34:35 +0000 (14:34 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506
am:
700c64200e
* commit '
700c64200e378bd6ab9e7578594d817410de3a39':
Change-Id: I09d04ee229d86a359135b2c85dacf76be876a133
Android Build Merger (Role) [Mon, 2 May 2016 14:31:42 +0000 (14:31 +0000)]
Merge "Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506 am:
700c64200e" into nyc-mr1-dev-plus-aosp
Nadia Benbernou [Mon, 2 May 2016 14:31:16 +0000 (14:31 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506
am:
700c64200e
* commit '
700c64200e378bd6ab9e7578594d817410de3a39':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: I38fb376d6dca59641794e1c93bdbf044b6f568ac
Nadia Benbernou [Mon, 2 May 2016 14:31:14 +0000 (14:31 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev am:
f4810f5506
am:
18210edc88
* commit '
18210edc8828289b68bef837276cc7d51c65e512':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: I63ce6f04cbd0236a901db226854e7242a5972af2
Nadia Benbernou [Mon, 2 May 2016 14:26:46 +0000 (14:26 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev
am:
f4810f5506
* commit '
f4810f5506203ac03439d1ed6e33e021540568f8':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: I3a16e15adaf26be3528224c265be9a0e82957a38
Nadia Benbernou [Mon, 2 May 2016 14:26:44 +0000 (14:26 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev
am:
f4810f5506
* commit '
f4810f5506203ac03439d1ed6e33e021540568f8':
Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581
Change-Id: Id88f0a6b35750313554ee2e52347ac51c45e88c8
Nadia Benbernou [Mon, 2 May 2016 14:15:45 +0000 (14:15 +0000)]
Merge "Add api to WearableExtender for setting and getting the dismissal id. Bug:
27696581" into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 13:08:30 +0000 (13:08 +0000)]
Merge "Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8 am:
3ac235673c" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Mon, 2 May 2016 13:07:57 +0000 (13:07 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8
am:
3ac235673c
* commit '
3ac235673cc49f7648cef4710522cc2ce76021aa':
Change-Id: I125390376bc62c4a991125acb458518ccbeaac25
Android Build Merger (Role) [Mon, 2 May 2016 13:04:59 +0000 (13:04 +0000)]
Merge "Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8 am:
3ac235673c" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Mon, 2 May 2016 13:04:25 +0000 (13:04 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8
am:
3ac235673c
* commit '
3ac235673cc49f7648cef4710522cc2ce76021aa':
Use Netd's binder interface to set resolver configuration.
Add Gservices settings for resolver configuration.
Change-Id: I69f888bb27b3bd632f63ec95558db14d59605c71
Lorenzo Colitti [Mon, 2 May 2016 13:04:22 +0000 (13:04 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev am:
4a992cbde8
am:
617c9a3625
* commit '
617c9a3625585c25f26e03aa9456adde1e7243cc':
Use Netd's binder interface to set resolver configuration.
Add Gservices settings for resolver configuration.
Change-Id: I36c07f09ac62620fd4119eff1f9da5a278d08144
Pierre Imai [Mon, 2 May 2016 13:00:13 +0000 (13:00 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev
am:
4a992cbde8
* commit '
4a992cbde834fdf3770e34b21361b47f4786f65f':
Use Netd's binder interface to set resolver configuration.
Add Gservices settings for resolver configuration.
Change-Id: I80fdc381bd3ff33a8efa6624d7115c346789ca17
Pierre Imai [Mon, 2 May 2016 13:00:09 +0000 (13:00 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev
am:
4a992cbde8
* commit '
4a992cbde834fdf3770e34b21361b47f4786f65f':
Use Netd's binder interface to set resolver configuration.
Add Gservices settings for resolver configuration.
Change-Id: I26969ef34712d12d6e8a2801f2c790a07f710492
Lorenzo Colitti [Mon, 2 May 2016 12:49:17 +0000 (12:49 +0000)]
Merge changes I86257bc8,I5c2221c5 into nyc-dev
* changes:
Use Netd's binder interface to set resolver configuration.
Add Gservices settings for resolver configuration.
Pierre Imai [Thu, 28 Apr 2016 08:00:04 +0000 (17:00 +0900)]
Use Netd's binder interface to set resolver configuration.
BUG:
25731675
Change-Id: I86257bc84371832466161e5357ae173c305a7d18
Pierre Imai [Thu, 21 Apr 2016 04:30:43 +0000 (13:30 +0900)]
Add Gservices settings for resolver configuration.
BUG:
25731675
Change-Id: I5c2221c5a2478fe2fa0fdf9ceeb13a932d758d33
Android Build Merger (Role) [Mon, 2 May 2016 08:24:58 +0000 (08:24 +0000)]
Merge "Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3 am:
e0e6cf8e87 am:
390a994f67" into nyc-mr1-dev-plus-aosp
Janis Danisevskis [Mon, 2 May 2016 08:24:30 +0000 (08:24 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3 am:
e0e6cf8e87
am:
390a994f67
* commit '
390a994f673e0a9f524be499e7f4e09e3f60e25a':
Change-Id: Ie90813ac64e54971f99543bfe14078b89eb98f89
Android Build Merger (Role) [Mon, 2 May 2016 08:21:04 +0000 (08:21 +0000)]
Merge "Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3 am:
e0e6cf8e87 am:
390a994f67" into nyc-mr1-dev-plus-aosp
Janis Danisevskis [Mon, 2 May 2016 08:20:40 +0000 (08:20 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3 am:
e0e6cf8e87
am:
390a994f67
* commit '
390a994f673e0a9f524be499e7f4e09e3f60e25a':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: I4787267e8820c077d377ef1da4e48fe0bb3e6d5c
Janis Danisevskis [Mon, 2 May 2016 08:20:37 +0000 (08:20 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3 am:
e0e6cf8e87
am:
190080e91f
* commit '
190080e91f9c18a43c1e89383724caca7e4b344a':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: I487a13d984f3817bb043c688279e6af1417466f3
Janis Danisevskis [Mon, 2 May 2016 08:16:24 +0000 (08:16 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3
am:
e0e6cf8e87
* commit '
e0e6cf8e877d9b748c5f2b10e5bccdc037e5afa7':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: Iaf572a0e27e3124c602be9ca94035dd4131a7521
Janis Danisevskis [Mon, 2 May 2016 08:16:21 +0000 (08:16 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9 am:
38d54f72e3
am:
e0e6cf8e87
* commit '
e0e6cf8e877d9b748c5f2b10e5bccdc037e5afa7':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: I5220a77379927c680c995b3872dc34ee53d1f54e
Janis Danisevskis [Mon, 2 May 2016 08:12:08 +0000 (08:12 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd am:
d92fe240b9
am:
38d54f72e3
* commit '
38d54f72e3795eb67eceacf5325b14a13492b25d':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: I12d68857f2fed0bb62b040df4193fc00cc97f500
Janis Danisevskis [Mon, 2 May 2016 08:08:03 +0000 (08:08 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs am:
73813c06cd
am:
d92fe240b9
* commit '
d92fe240b9811bd1b20af0b744f1aa727c80b97c':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: I7371da3bffa54b8904bd18d52b9803fb45afa31e
Janis Danisevskis [Mon, 2 May 2016 08:03:54 +0000 (08:03 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs
am:
73813c06cd
* commit '
73813c06cd59a94fe53483b657fa58e954c97551':
Clarifies that filesystem permission 0700 is not enforced as an invariant
Change-Id: I92bcad43201a90273af9428a1a0a97e7e66b03bb
Janis Danisevskis [Mon, 2 May 2016 07:53:52 +0000 (07:53 +0000)]
Merge "Clarifies that filesystem permission 0700 is not enforced as an invariant" into mnc-mr-docs
Seigo Nonaka [Mon, 2 May 2016 03:18:02 +0000 (03:18 +0000)]
Merge "Add missing theme entries to Holo.Light" into nyc-dev am:
9d430f5189
am:
da139cc682
* commit '
da139cc682b417d32e74f0931e043eae6593de75':
Change-Id: Icf722fb386a2c19530e04c414206a69e3666e560
Seigo Nonaka [Mon, 2 May 2016 03:06:10 +0000 (03:06 +0000)]
Merge "Add missing theme entries to Holo.Light" into nyc-dev am:
9d430f5189
am:
1ce1db7d4b
* commit '
1ce1db7d4b4e0e891b954b91d228d719bb9f7a6d':
Add missing theme entries to Holo.Light
Change-Id: I5cb0b917c21a354092f0775a649f423ba64acaa9
Seigo Nonaka [Mon, 2 May 2016 03:06:07 +0000 (03:06 +0000)]
Merge "Add missing theme entries to Holo.Light" into nyc-dev
am:
9d430f5189
* commit '
9d430f5189c4060b308f59b871d7dcc2ee38b986':
Add missing theme entries to Holo.Light
Change-Id: I09ab714a706ea15a4d9da13dbb8298c4a61785d4
Seigo Nonaka [Mon, 2 May 2016 03:02:01 +0000 (03:02 +0000)]
Merge "Add missing theme entries to Holo.Light" into nyc-dev
am:
9d430f5189
* commit '
9d430f5189c4060b308f59b871d7dcc2ee38b986':
Add missing theme entries to Holo.Light
Change-Id: I1c57fd46aa65756a44af06f9b1c2a21f301d597d
Seigo Nonaka [Mon, 2 May 2016 02:55:12 +0000 (02:55 +0000)]
Merge "Add missing theme entries to Holo.Light" into nyc-dev
Wale Ogunwale [Sun, 1 May 2016 17:30:03 +0000 (10:30 -0700)]
Don't move stack to front when creating a task for activity to be started
This causes foucs to move to the current activity in the stack which isn't
needed. Focus will be moved when the new activity is started in the stack.
Bug:
26381750
Change-Id: Ia76962dc5ba3ce336d2a4e074d14db06eebbe78c
Android Build Merger (Role) [Sat, 30 Apr 2016 09:28:49 +0000 (09:28 +0000)]
Merge "Merge "Address review comments on ag/962875." into nyc-dev am:
6d1a776c26 am:
21f19f3d64" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Sat, 30 Apr 2016 09:28:23 +0000 (09:28 +0000)]
Merge "Address review comments on ag/962875." into nyc-dev am:
6d1a776c26
am:
21f19f3d64
* commit '
21f19f3d64667afe6593b8454893413d064a689a':
Change-Id: I780e39bb0b3cbbe5b118f05e57aecd9c5649ac26
Android Build Merger (Role) [Sat, 30 Apr 2016 09:26:35 +0000 (09:26 +0000)]
Merge "Merge "Address review comments on ag/962875." into nyc-dev am:
6d1a776c26 am:
21f19f3d64" into nyc-mr1-dev-plus-aosp
Lorenzo Colitti [Sat, 30 Apr 2016 09:26:11 +0000 (09:26 +0000)]
Merge "Address review comments on ag/962875." into nyc-dev am:
6d1a776c26
am:
21f19f3d64
* commit '
21f19f3d64667afe6593b8454893413d064a689a':
Address review comments on ag/962875.
Change-Id: I1fab0f22f5120fef57f6e7ab87ca182e4f51aa58
Lorenzo Colitti [Sat, 30 Apr 2016 09:26:08 +0000 (09:26 +0000)]
Merge "Address review comments on ag/962875." into nyc-dev am:
6d1a776c26
am:
95e0885c9a
* commit '
95e0885c9a8df76de5fc128b12b7cef81f730088':
Address review comments on ag/962875.
Change-Id: Icf2ee1ca7555d8517509b2e0f25f347f46959571
Lorenzo Colitti [Sat, 30 Apr 2016 09:23:54 +0000 (09:23 +0000)]
Merge "Address review comments on ag/962875." into nyc-dev
am:
6d1a776c26
* commit '
6d1a776c26206ea44339f19e13b413aa7d25bd6d':
Address review comments on ag/962875.
Change-Id: Ie388c736c3f61001fd620c1d35030d508672f390
Lorenzo Colitti [Sat, 30 Apr 2016 09:23:53 +0000 (09:23 +0000)]
Merge "Address review comments on ag/962875." into nyc-dev
am:
6d1a776c26
* commit '
6d1a776c26206ea44339f19e13b413aa7d25bd6d':
Address review comments on ag/962875.
Change-Id: I201ec9b9d3d687f9b8aaba71a7e0a75cb5019319
TreeHugger Robot [Sat, 30 Apr 2016 09:19:50 +0000 (09:19 +0000)]
Merge "Address review comments on ag/962875." into nyc-dev
Android Build Merger (Role) [Sat, 30 Apr 2016 03:39:42 +0000 (03:39 +0000)]
Merge "Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am:
e7fefcb565 am:
1616125d53" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Sat, 30 Apr 2016 03:39:19 +0000 (03:39 +0000)]
Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am:
e7fefcb565
am:
1616125d53
* commit '
1616125d53bb253745a2dbbac668eda0ed5dc4de':
Change-Id: I0d834efcbc353f459803d25e95bd28ab0b5bcd70
Android Build Merger (Role) [Sat, 30 Apr 2016 03:37:42 +0000 (03:37 +0000)]
Merge "Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am:
e7fefcb565 am:
1616125d53" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Sat, 30 Apr 2016 03:37:16 +0000 (03:37 +0000)]
Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am:
e7fefcb565
am:
1616125d53
* commit '
1616125d53bb253745a2dbbac668eda0ed5dc4de':
Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Change-Id: I0e2c589465154208c8fcc7a216a7c5efbc4b0044
Wale Ogunwale [Sat, 30 Apr 2016 03:37:12 +0000 (03:37 +0000)]
Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev am:
e7fefcb565
am:
1a9d6ff291
* commit '
1a9d6ff2919620954e9ae0d73bd0057b657b4835':
Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Change-Id: I89ab61da807d0043372a253aa6c1cb1b70c4698e
Android Build Merger (Role) [Sat, 30 Apr 2016 03:35:16 +0000 (03:35 +0000)]
Merge "Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am:
4f928358d2 am:
5b57ee8f5a" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Sat, 30 Apr 2016 03:34:59 +0000 (03:34 +0000)]
Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev
am:
e7fefcb565
* commit '
e7fefcb5650afddff544c008bc06ce748f635727':
Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Change-Id: I7187746826a5ae3f82f95ac203d6ae063b56275e
Wale Ogunwale [Sat, 30 Apr 2016 03:34:56 +0000 (03:34 +0000)]
Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev
am:
e7fefcb565
* commit '
e7fefcb5650afddff544c008bc06ce748f635727':
Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Change-Id: I8755b8cae62fe4fb86a9015ffefd04d009b5eb58
Adam Lesinski [Sat, 30 Apr 2016 03:34:44 +0000 (03:34 +0000)]
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am:
4f928358d2
am:
5b57ee8f5a
* commit '
5b57ee8f5adf03c8a5197cb34c01e0aa4cb69422':
Change-Id: I1abbe865d820d86392ced3f9666f8fd101c654cd
Android Build Merger (Role) [Sat, 30 Apr 2016 03:33:04 +0000 (03:33 +0000)]
Merge "Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am:
4f928358d2 am:
5b57ee8f5a" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Sat, 30 Apr 2016 03:32:40 +0000 (03:32 +0000)]
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am:
4f928358d2
am:
5b57ee8f5a
* commit '
5b57ee8f5adf03c8a5197cb34c01e0aa4cb69422':
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Change-Id: I6ff2ac82c157c1f8c4e78010265493725c9e0d69
Adam Lesinski [Sat, 30 Apr 2016 03:32:39 +0000 (03:32 +0000)]
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev am:
4f928358d2
am:
6226d0a364
* commit '
6226d0a364fba62947aa3ec7d4a1a056e0ee1838':
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Change-Id: I9bd04d2000ed5041e25dff7957b8d12200e64f17
Adam Lesinski [Sat, 30 Apr 2016 03:30:30 +0000 (03:30 +0000)]
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev
am:
4f928358d2
* commit '
4f928358d2a4023dc6ba5a0bbdb1a63a3e1bfa7a':
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Change-Id: I08146a8a389a753db8eb7f2d925b7f2e986f3b0e
Adam Lesinski [Sat, 30 Apr 2016 03:30:28 +0000 (03:30 +0000)]
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev
am:
4f928358d2
* commit '
4f928358d2a4023dc6ba5a0bbdb1a63a3e1bfa7a':
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Change-Id: I56cdc77ad57aceb8e60f7d0f834a2064d7bcd57a
TreeHugger Robot [Sat, 30 Apr 2016 03:29:26 +0000 (03:29 +0000)]
Merge "Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default" into nyc-dev
TreeHugger Robot [Sat, 30 Apr 2016 03:26:37 +0000 (03:26 +0000)]
Merge "BatteryStats: Reset per-User Bluetooth and Modem controller activity" into nyc-dev
Android Build Merger (Role) [Sat, 30 Apr 2016 02:31:42 +0000 (02:31 +0000)]
Merge "Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am:
3cb7f6bdcd am:
8fec99caae" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Sat, 30 Apr 2016 02:31:19 +0000 (02:31 +0000)]
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am:
3cb7f6bdcd
am:
8fec99caae
* commit '
8fec99caae01261f7672207897a85207db616a9b':
Change-Id: Ia7c5c9ee0cbd69cdc10724d56f0cd71fe62a7699
Android Build Merger (Role) [Sat, 30 Apr 2016 02:29:45 +0000 (02:29 +0000)]
Merge "Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am:
3cb7f6bdcd am:
8fec99caae" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Sat, 30 Apr 2016 02:29:20 +0000 (02:29 +0000)]
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am:
3cb7f6bdcd
am:
132d565eac
* commit '
132d565eacfbf287e4803051b28a0156b996f83f':
BatteryStats: Keep track of coulomb counter
Change-Id: I0b2e127b0b551080ce33794fab09ba4b8a94688e
Adam Lesinski [Sat, 30 Apr 2016 02:29:17 +0000 (02:29 +0000)]
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev am:
3cb7f6bdcd
am:
8fec99caae
* commit '
8fec99caae01261f7672207897a85207db616a9b':
BatteryStats: Keep track of coulomb counter
Change-Id: I5724f9d560019d0434b36a727988eafa92a3fe3d
Adam Lesinski [Sat, 30 Apr 2016 02:27:08 +0000 (02:27 +0000)]
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev
am:
3cb7f6bdcd
* commit '
3cb7f6bdcda2697eff10853360396d8635d66120':
BatteryStats: Keep track of coulomb counter
Change-Id: Ica6666696324ab731324692538b1bb3dfc300d92
Adam Lesinski [Sat, 30 Apr 2016 02:27:06 +0000 (02:27 +0000)]
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev
am:
3cb7f6bdcd
* commit '
3cb7f6bdcda2697eff10853360396d8635d66120':
BatteryStats: Keep track of coulomb counter
Change-Id: I6d7bbadd79fcc42752eaff74b6a2b6b405f3fe2a
TreeHugger Robot [Sat, 30 Apr 2016 02:21:36 +0000 (02:21 +0000)]
Merge "BatteryStats: Keep track of coulomb counter" into nyc-dev
Adam Lesinski [Sat, 30 Apr 2016 00:56:58 +0000 (17:56 -0700)]
BatteryStats: Reset per-User Bluetooth and Modem controller activity
Bug:
28469956
Change-Id: I4db68ecc5b7bde8dd552caadee489b7bad3d6cbc
Android Build Merger (Role) [Sat, 30 Apr 2016 00:45:40 +0000 (00:45 +0000)]
Merge "Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev am:
3c6736b078 am:
832449800e" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Sat, 30 Apr 2016 00:45:19 +0000 (00:45 +0000)]
Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev am:
3c6736b078
am:
832449800e
* commit '
832449800e2e5068ab0eb986bb359906ddf6efdc':
Change-Id: Iea9cf234572a540154643429cdd2e14411713d4f
Android Build Merger (Role) [Sat, 30 Apr 2016 00:43:34 +0000 (00:43 +0000)]
Merge "Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev am:
3c6736b078 am:
832449800e" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Sat, 30 Apr 2016 00:42:59 +0000 (00:42 +0000)]
Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev am:
3c6736b078
am:
832449800e
* commit '
832449800e2e5068ab0eb986bb359906ddf6efdc':
VideoCapabilities: account for block size for getAchievableRates
Change-Id: Ice8dda5e378fdac4af3f7935e8592e45297ce8d1
Lajos Molnar [Sat, 30 Apr 2016 00:42:56 +0000 (00:42 +0000)]
Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev am:
3c6736b078
am:
a8499e4558
* commit '
a8499e455801ef4106d519ba3087085fb9343b60':
VideoCapabilities: account for block size for getAchievableRates
Change-Id: I227f9a0d85acd8321845698cecda293e5c0b2685
Lajos Molnar [Sat, 30 Apr 2016 00:40:47 +0000 (00:40 +0000)]
Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev
am:
3c6736b078
* commit '
3c6736b0785d3cf6c7a8cd687b9c63f9c7dea542':
VideoCapabilities: account for block size for getAchievableRates
Change-Id: I642dedb99221e99e0e06d43fa74a1545c0519237
Lajos Molnar [Sat, 30 Apr 2016 00:40:46 +0000 (00:40 +0000)]
Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev
am:
3c6736b078
* commit '
3c6736b0785d3cf6c7a8cd687b9c63f9c7dea542':
VideoCapabilities: account for block size for getAchievableRates
Change-Id: I69018ca03558a0dded94cf49508c3db042b4f12f
Adam Lesinski [Fri, 29 Apr 2016 00:31:12 +0000 (17:31 -0700)]
BatteryStats: Keep track of coulomb counter
Bug:
27174034
Change-Id: Ica66817faa20b9788536f28f0e593483f033904b
TreeHugger Robot [Sat, 30 Apr 2016 00:36:52 +0000 (00:36 +0000)]
Merge "VideoCapabilities: account for block size for getAchievableRates" into nyc-dev
Wale Ogunwale [Fri, 29 Apr 2016 23:46:47 +0000 (16:46 -0700)]
Set ActivityInfo.resizeMode to RESIZE_MODE_RESIZEABLE by default
Previous assumption was ActivityInfo was completely initialized in
PackageParser, but that isn't the case with the ResolverActivity
whose ActivityInfo in populated in PackageManagerService.
This was causing the device to exist multi-window mode since
the default ActivityInfo.resizeMode was 0 (RESIZE_MODE_UNRESIZEABLE).
Bug:
28378995
Change-Id: I46e58d434f2a0274c461a8ff00b59ed3d2a1dd52
Philip P. Moltmann [Fri, 29 Apr 2016 23:16:08 +0000 (16:16 -0700)]
Visibility of pageRangeTitle =!= pageRangeText
Before if we had only a single page we showed the title, but not the
text
Change-Id: Ie2c178eaf19885e0b1dcc803b9da23ed687764a7
OSDN Git Service
