OSDN Git Service
Selim Cinek [Thu, 1 Jun 2017 18:31:05 +0000 (11:31 -0700)]
resolve merge conflicts of
c08a40267be5 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4acedef91b60b76d5e8f07d15ed92325a9d6c8b1
Selim Cinek [Thu, 1 Jun 2017 17:51:48 +0000 (17:51 +0000)]
Merge "Fixed an issue where the panel could be stuck tracking" into oc-dev
am:
a7a39ea187
Change-Id: I05694e3dc92769270c1a286a69777a1519ba51da
Daniel Nishi [Thu, 1 Jun 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Fix an NPE when FileCollector runs." into oc-dev am:
bfa8b3d542
am:
4ae0744252
Change-Id: Ie75d0d87f841827114c48d92faa548367ff9fc68
Selim Cinek [Thu, 1 Jun 2017 17:40:42 +0000 (17:40 +0000)]
Merge "Fixed an issue where the panel could be stuck tracking" into oc-dev
Daniel Nishi [Thu, 1 Jun 2017 17:38:25 +0000 (17:38 +0000)]
Merge "Fix an NPE when FileCollector runs." into oc-dev
am:
bfa8b3d542
Change-Id: I860a840d23cd91f5fdbdfc6f0c35dc20726dc559
Bryce Lee [Thu, 1 Jun 2017 17:33:26 +0000 (17:33 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev am:
689f41e871
am:
8821015094
Change-Id: I301e6da3064e545d01d54df02ab73bb27fddf5b9
Robert Greenwalt [Thu, 1 Jun 2017 17:31:08 +0000 (17:31 +0000)]
Merge "Move appName inside Downloadrequest." am:
142a392b75 am:
196cb3dff6 am:
7c3314f19c
am:
c593bd3cc7
Change-Id: Ic957a8056b96e0ad2da7c5529aa54c2e7a969e0e
Daniel Nishi [Thu, 1 Jun 2017 17:29:54 +0000 (17:29 +0000)]
Merge "Fix an NPE when FileCollector runs." into oc-dev
Bryce Lee [Thu, 1 Jun 2017 17:25:38 +0000 (17:25 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev
am:
689f41e871
Change-Id: If1ad2d95a354c1b22d52dd219a8cda70c80e0d17
Jorim Jaggi [Thu, 1 Jun 2017 17:22:22 +0000 (17:22 +0000)]
Merge "Remove starting window logging" into oc-dev am:
1e93ad44bc
am:
f08ff05438
Change-Id: Icb14b1699d9c5e29467cbae247a6ca9fb95d9780
Robert Greenwalt [Thu, 1 Jun 2017 17:20:49 +0000 (17:20 +0000)]
Merge "Move appName inside Downloadrequest." am:
142a392b75 am:
196cb3dff6
am:
7c3314f19c
Change-Id: Iaa997634e7d9370fb634d9741ba4266db6cb9b2f
TreeHugger Robot [Thu, 1 Jun 2017 17:14:15 +0000 (17:14 +0000)]
Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev
Andrii Kulian [Thu, 1 Jun 2017 17:13:50 +0000 (17:13 +0000)]
Merge "Create ActivityDisplay if its registered in DisplayManager" into oc-dev am:
e871c01bd0
am:
f7a35d6684
Change-Id: I357e19b93ac5b1a8396132a14ea43039e0676c34
Robert Greenwalt [Thu, 1 Jun 2017 17:11:56 +0000 (17:11 +0000)]
Merge "Move appName inside Downloadrequest." am:
142a392b75
am:
196cb3dff6
Change-Id: I79e1beb5c211a8ff0f90a2f473f85b0068abe61a
Jorim Jaggi [Thu, 1 Jun 2017 17:10:48 +0000 (17:10 +0000)]
Merge "Remove starting window logging" into oc-dev
am:
1e93ad44bc
Change-Id: I0caebcfb47b5f130cfd93d5674bbf173fabd36b2
Selim Cinek [Thu, 1 Jun 2017 17:10:37 +0000 (17:10 +0000)]
Merge "Fixed an issue where the shade would jump"
TreeHugger Robot [Thu, 1 Jun 2017 17:09:11 +0000 (17:09 +0000)]
Merge "Fix flakiness in FadeTransitionTest"
Robert Greenwalt [Thu, 1 Jun 2017 17:05:40 +0000 (17:05 +0000)]
Merge "Move appName inside Downloadrequest."
am:
142a392b75
Change-Id: I6512d4bc2406f23571c1d4e6425353930fb9b847
Andrii Kulian [Thu, 1 Jun 2017 17:03:01 +0000 (17:03 +0000)]
Merge "Create ActivityDisplay if its registered in DisplayManager" into oc-dev
am:
e871c01bd0
Change-Id: I794a53de17d5c6e2d5002c0b363b692723d4dcdd
Jorim Jaggi [Thu, 1 Jun 2017 16:54:16 +0000 (16:54 +0000)]
Merge "Remove starting window logging" into oc-dev
Robert Greenwalt [Thu, 1 Jun 2017 16:52:32 +0000 (16:52 +0000)]
Merge "Move appName inside Downloadrequest."
Andrii Kulian [Thu, 1 Jun 2017 16:50:56 +0000 (16:50 +0000)]
Merge "Create ActivityDisplay if its registered in DisplayManager" into oc-dev
Ivan Podogov [Thu, 1 Jun 2017 15:19:56 +0000 (15:19 +0000)]
Merge "Fix setRequestedOrientation() freeze on Android Wear." into oc-dev am:
a30fdcb687
am:
660e70e63a
Change-Id: I6926799fd8fb526ba423d6b1df7842c1a33fea2a
Ivan Podogov [Thu, 1 Jun 2017 15:12:42 +0000 (15:12 +0000)]
Merge "Fix setRequestedOrientation() freeze on Android Wear." into oc-dev
am:
a30fdcb687
Change-Id: I0046647f4f773acb06a1dcdb45d0499ee831ae2a
Ivan Podogov [Thu, 1 Jun 2017 15:06:28 +0000 (15:06 +0000)]
Merge "Fix setRequestedOrientation() freeze on Android Wear." into oc-dev
Bryce Lee [Wed, 31 May 2017 17:27:42 +0000 (10:27 -0700)]
Handle not having main window in createThumbnailAppAnimator.
A recent code change associated the SurfaceControl with the main
window owner id. However, it is possible for the an AppWindowToken to
not have a main window. This case is handled later in the method.
This CL restores the original behavior of using the calling uid in
the cases no main window is present.
Change-Id: I8255be9e0d68adc75fda0947c64f869b7eeb76c9
Fixes:
62096254
Test: go/wm-smoke
TreeHugger Robot [Thu, 1 Jun 2017 14:59:57 +0000 (14:59 +0000)]
Merge "Expose hidden apis used by CTS as TestApi"
Dan Sandler [Thu, 1 Jun 2017 14:44:43 +0000 (14:44 +0000)]
Merge "Dump info about all RemoteViews in a Notification." into oc-dev am:
94ea9bb571
am:
c56a0533be
Change-Id: I89a2fefbdd0ec8779e4abbb2f4f0d4e547caee2e
Dan Sandler [Thu, 1 Jun 2017 14:37:12 +0000 (14:37 +0000)]
Merge "Dump info about all RemoteViews in a Notification." into oc-dev
am:
94ea9bb571
Change-Id: I64fa3be76546c527341f8718c28d523446422b63
TreeHugger Robot [Thu, 1 Jun 2017 14:29:42 +0000 (14:29 +0000)]
Merge "Dump info about all RemoteViews in a Notification." into oc-dev
Hugo Benichi [Thu, 1 Jun 2017 14:09:04 +0000 (14:09 +0000)]
Merge "Prettify the captive portal sign-in activity" am:
5dbdffbf81 am:
6e145ffb0e am:
6e238648c2 -s ours
am:
5ad47e271c -s ours
Change-Id: Ia63a899cf2c50b7b8a6197d61c153db5ae919e8d
Hugo Benichi [Thu, 1 Jun 2017 14:00:17 +0000 (14:00 +0000)]
Merge "Prettify the captive portal sign-in activity" am:
5dbdffbf81 am:
6e145ffb0e
am:
6e238648c2 -s ours
Change-Id: I8b4ede5d116cf753d3db9ab78fc027505acd2ef0
Hugo Benichi [Thu, 1 Jun 2017 13:52:16 +0000 (13:52 +0000)]
Merge "Prettify the captive portal sign-in activity" am:
5dbdffbf81
am:
6e145ffb0e
Change-Id: I183a1c4e9b38b88c541eb3acf3412eb29744bd69
Hugo Benichi [Thu, 1 Jun 2017 13:44:19 +0000 (13:44 +0000)]
Merge "Prettify the captive portal sign-in activity"
am:
5dbdffbf81
Change-Id: I71b55fc8869471c02f470980d013951b285b3ebb
Ivan Podogov [Fri, 26 May 2017 16:42:15 +0000 (17:42 +0100)]
Fix setRequestedOrientation() freeze on Android Wear.
In ag/
1460784 and ag/
1551198, logic of
ActivityManagerService.updateConfigurationLocked
(now updateDisplayOverrideConfigurationLocked) was changed a bit:
before those CL's, with (changes == 0) we were still calling
mWindowManager.setNewConfiguration(mGlobalConfiguration)
(which is now mWindowManager.setNewDisplayOverrideConfiguration).
Now, when there was a call to Activity.setRequestedOrientation, the
window becomes frozen and waiting for configuration, which is never sent
since there are no changes detected (which we don't know in advance when
freezing the window). This is important for watches, since they have
"square" screens, and resources configuration for them doesn't change
after requesting landscape orientation, i.e. display rotates 90 degrees,
yet the layout stays portrait. As a result, device becomes frozen.
This CL only moves mWindowManager.setNewDisplayOverrideConfiguration
call outside of the (changes == 0) check to restore the old logic.
Bug:
37684680
Test: go/wm-smoke (on Pixel), manual (on Wear)
Change-Id: Idf1f5989173494d51437b9a66296b4cac82d15c2
Treehugger Robot [Thu, 1 Jun 2017 13:34:14 +0000 (13:34 +0000)]
Merge "Prettify the captive portal sign-in activity"
TreeHugger Robot [Thu, 1 Jun 2017 11:44:11 +0000 (11:44 +0000)]
Merge "Increase the timeout and add stopping managed profile test"
Yohann Roussel [Thu, 1 Jun 2017 09:58:47 +0000 (09:58 +0000)]
Merge "Add tests on MultiDex.installInstrumentation" am:
f547c4045f am:
56b36c092b am:
f0b015d706
am:
6c836145b2
Change-Id: I524788658adc4be7d8c7e198d8a561978da145a9
Yohann Roussel [Thu, 1 Jun 2017 09:49:06 +0000 (09:49 +0000)]
Merge "Add tests on MultiDex.installInstrumentation" am:
f547c4045f am:
56b36c092b
am:
f0b015d706
Change-Id: Ic9dfc9678def6d783ac6f14e0f8372d946cedbf1
Hugo Benichi [Thu, 1 Jun 2017 09:45:25 +0000 (09:45 +0000)]
Merge "Prettify the captive portal sign-in activity" into oc-dev am:
8bc542695c
am:
9b0e9c87ed
Change-Id: I4a40f12d804a4cab02c48b024570b3ca060b4248
Yohann Roussel [Thu, 1 Jun 2017 09:40:00 +0000 (09:40 +0000)]
Merge "Add tests on MultiDex.installInstrumentation" am:
f547c4045f
am:
56b36c092b
Change-Id: I1aebb84f762c990430f52f7b6312fdd3b61a0be4
Hugo Benichi [Thu, 1 Jun 2017 09:38:51 +0000 (09:38 +0000)]
Merge "Prettify the captive portal sign-in activity" into oc-dev
am:
8bc542695c
Change-Id: Id655667e19c2ddc65a3d3deb6a447850ec02e90c
Hugo Benichi [Wed, 17 May 2017 00:26:30 +0000 (09:26 +0900)]
Prettify the captive portal sign-in activity
- fuses url bar with activity header: url is now the subtitle
- url appears as text and not as editable content
- url only shows host name
- header style is the device default for Settings
- Material progress bar
- progress bar disappears at page load finished
- webview does not jump at page load finished
Bug:
62107381
Bug:
38197949
Test: tested by manually triggering the sign-in activity
Merged-In: Id75023acad04f444dbfc41de56814a09e70cc6f9
(cherry pick from commit
a206649a6f66f16cc56db2f4e32b846d9b03501c)
Change-Id: I5c3e5ebac18fef6611c215d04d88ffef67b2b640
Hugo Benichi [Thu, 1 Jun 2017 09:32:24 +0000 (09:32 +0000)]
Merge "Prettify the captive portal sign-in activity" into oc-dev
Yohann Roussel [Thu, 1 Jun 2017 09:31:07 +0000 (09:31 +0000)]
Merge "Add tests on MultiDex.installInstrumentation"
am:
f547c4045f
Change-Id: I022a89d1fdacca4a96ea493841609c48a538370b
Yohann Roussel [Thu, 1 Jun 2017 09:23:13 +0000 (09:23 +0000)]
Merge "Add tests on MultiDex.installInstrumentation"
Dongwon Kang [Thu, 1 Jun 2017 09:17:29 +0000 (09:17 +0000)]
Merge "Update documentation of MediaCodec regarding partial frame." into oc-dev am:
878fc6a81c
am:
1948af7bd0
Change-Id: I9970625b727502eb85a888eab0867e9b583abda1
Dongwon Kang [Thu, 1 Jun 2017 09:10:15 +0000 (09:10 +0000)]
Merge "Update documentation of MediaCodec regarding partial frame." into oc-dev
am:
878fc6a81c
Change-Id: I2548802b594a2b4710c5661ffecf26dcdacdf1d7
TreeHugger Robot [Thu, 1 Jun 2017 09:07:38 +0000 (09:07 +0000)]
Merge "MediaRouter: Remove the globally selected route feature"
TreeHugger Robot [Thu, 1 Jun 2017 09:05:33 +0000 (09:05 +0000)]
Merge "Update documentation of MediaCodec regarding partial frame." into oc-dev
Narayan Kamath [Thu, 1 Jun 2017 09:00:21 +0000 (09:00 +0000)]
Merge "Revert "Temporarily enable HWUI opengl validation""
Narayan Kamath [Thu, 1 Jun 2017 08:54:50 +0000 (08:54 +0000)]
Revert "Temporarily enable HWUI opengl validation"
This reverts commit
39aa790f744d504dfcafbf5e9224b7d9906067e4.
Seems to have broken all builds on master. Unclear why the presubmit
succeeded.
Test: make
Change-Id: I1ff8472495b5aafe6c1c89c1c8385d94ae584685
TreeHugger Robot [Thu, 1 Jun 2017 08:41:02 +0000 (08:41 +0000)]
Merge "Create icon layout style so custom preferences can reuse"
Aurimas Liutikas [Thu, 1 Jun 2017 08:20:36 +0000 (08:20 +0000)]
Merge "Merge "Fix TimePickerDialog positive button clicks." into oc-dev am:
87c727a169" into oc-dev-plus-aosp
am:
fa69e851d2
Change-Id: I382f86e733eabde1dcf59cd7a96dda28fd33cbdc
Erik Kline [Thu, 1 Jun 2017 08:18:25 +0000 (08:18 +0000)]
Merge "Add a tethering offload settings kill switch" am:
7cf3086f37 am:
503a6952b2 am:
03941982dc
am:
9d2abb4b40
Change-Id: Ibeddc103a63702096972fa505071dcad4bb47a28
Charles He [Thu, 1 Jun 2017 08:16:29 +0000 (08:16 +0000)]
Merge "SystemUI: fix notification redaction logic." into oc-dev am:
5f3cab514b
am:
5de2e7dfe2
Change-Id: Ib7f35d8239f67be672ffeadaccc9d2c1f72354bb
Android Build Merger (Role) [Thu, 1 Jun 2017 08:12:59 +0000 (08:12 +0000)]
Merge "Merge "Fix TimePickerDialog positive button clicks." into oc-dev am:
87c727a169" into oc-dev-plus-aosp
Erik Kline [Thu, 1 Jun 2017 08:10:51 +0000 (08:10 +0000)]
Merge "Add a tethering offload settings kill switch" am:
7cf3086f37 am:
503a6952b2
am:
03941982dc
Change-Id: I7e15919817c59579ff6e7b28e858f13c3090ee5c
Charles He [Thu, 1 Jun 2017 08:10:46 +0000 (08:10 +0000)]
Merge "SystemUI: fix incorrect redaction of profile notifications." into oc-dev am:
1a3bf132c8
am:
165f304de5
Change-Id: I155273a9147547b8f461072b73d61bb83e20fdfe
Aurimas Liutikas [Thu, 1 Jun 2017 08:10:46 +0000 (08:10 +0000)]
Merge "Fix TimePickerDialog positive button clicks." into oc-dev
am:
87c727a169
Change-Id: I805b62533328677b4c0b4b5b98ce29eabeab8b4d
Erik Kline [Thu, 1 Jun 2017 08:04:20 +0000 (08:04 +0000)]
Merge "Add a tethering offload settings kill switch" am:
7cf3086f37
am:
503a6952b2
Change-Id: I6be567bb315a5797bbc71f5f48efc522b947f678
Charles He [Thu, 1 Jun 2017 08:03:58 +0000 (08:03 +0000)]
Merge "SystemUI: fix notification redaction logic." into oc-dev
am:
5f3cab514b
Change-Id: I4d60ecd170bd946ba1457bf6048d721d355349b7
TreeHugger Robot [Thu, 1 Jun 2017 08:02:44 +0000 (08:02 +0000)]
Merge "Fix TimePickerDialog positive button clicks." into oc-dev
Charles He [Thu, 1 Jun 2017 08:01:45 +0000 (08:01 +0000)]
Merge "SystemUI: fix incorrect redaction of profile notifications." into oc-dev
am:
1a3bf132c8
Change-Id: I57012004945c865017326c9b0a360b72c4ec67f3
Erik Kline [Thu, 1 Jun 2017 07:59:11 +0000 (07:59 +0000)]
Merge "Add a tethering offload settings kill switch"
am:
7cf3086f37
Change-Id: I13264b4ae23c8754b61ff46cafbb1b5f31bd14a3
Charles He [Thu, 1 Jun 2017 07:56:49 +0000 (07:56 +0000)]
Merge "SystemUI: fix notification redaction logic." into oc-dev
Charles He [Thu, 1 Jun 2017 07:56:23 +0000 (07:56 +0000)]
Merge "SystemUI: fix incorrect redaction of profile notifications." into oc-dev
Treehugger Robot [Thu, 1 Jun 2017 07:50:35 +0000 (07:50 +0000)]
Merge "Add a tethering offload settings kill switch"
jackqdyulei [Thu, 1 Jun 2017 07:44:09 +0000 (07:44 +0000)]
Merge "Add BottomLabelLayout for battery graph" into oc-dev am:
9e6519c7e1
am:
4ca9c05994
Change-Id: If4326e4fbf88b54bbe54b8d9c38d9f04b37c77a3
Erik Wolsheimer [Thu, 1 Jun 2017 07:38:34 +0000 (07:38 +0000)]
Merge "Support multi-window on low-memory watches." into oc-dev am:
c6372cceb1
am:
ba90d46a6e
Change-Id: I133f2ede861a2c55df7cda26f34c80447c80733d
TreeHugger Robot [Thu, 1 Jun 2017 07:36:16 +0000 (07:36 +0000)]
Merge "Add Roboto Condensed Medium to fonts.xml"
jackqdyulei [Thu, 1 Jun 2017 07:33:13 +0000 (07:33 +0000)]
Merge "Add BottomLabelLayout for battery graph" into oc-dev
am:
9e6519c7e1
Change-Id: I51f780433620c8df9455481d90436b945ec93f51
Erik Wolsheimer [Thu, 1 Jun 2017 07:29:13 +0000 (07:29 +0000)]
Merge "Support multi-window on low-memory watches." into oc-dev
am:
c6372cceb1
Change-Id: I77921a68a231dd3504f06a726af4f1b7903ac44d
Jack He [Thu, 1 Jun 2017 07:27:44 +0000 (07:27 +0000)]
Merge "Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726 am:
10cb6f3b4c am:
0998ec224c" into oc-dev-plus-aosp
am:
8002afb7eb
Change-Id: I78494fbd5551607c6c4928ceed495b82af141783
TreeHugger Robot [Thu, 1 Jun 2017 07:26:40 +0000 (07:26 +0000)]
Merge "Add BottomLabelLayout for battery graph" into oc-dev
Android Build Merger (Role) [Thu, 1 Jun 2017 07:24:01 +0000 (07:24 +0000)]
Merge "Merge "Ensure null/empty phone number does not crash international number check." into oc-dev am:
0f542b48fb am:
58e8a224e3"
Tyler Gunn [Thu, 1 Jun 2017 07:22:47 +0000 (07:22 +0000)]
Merge "Ensure null/empty phone number does not crash international number check." into oc-dev am:
0f542b48fb
am:
58e8a224e3
Change-Id: I14a17436328f6324842cbc7c257baf9e4cf60c7f
TreeHugger Robot [Thu, 1 Jun 2017 07:20:54 +0000 (07:20 +0000)]
Merge "AAPT2: XML configuration file parser."
TreeHugger Robot [Thu, 1 Jun 2017 07:19:41 +0000 (07:19 +0000)]
Merge "Support multi-window on low-memory watches." into oc-dev
Android Build Merger (Role) [Thu, 1 Jun 2017 07:17:44 +0000 (07:17 +0000)]
Merge "Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726 am:
10cb6f3b4c am:
0998ec224c" into oc-dev-plus-aosp
Jack He [Thu, 1 Jun 2017 07:15:13 +0000 (07:15 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726 am:
10cb6f3b4c
am:
0998ec224c
Change-Id: I35533ed7e2b8f8deff741cb3296156e9ccf5e076
TreeHugger Robot [Thu, 1 Jun 2017 07:14:57 +0000 (07:14 +0000)]
Merge "AAPT2: XML schema and an example configuraiton"
Tyler Gunn [Thu, 1 Jun 2017 07:14:29 +0000 (07:14 +0000)]
Merge "Ensure null/empty phone number does not crash international number check." into oc-dev
am:
0f542b48fb
Change-Id: I6b534dbb9253ad66c850c8d55a8e4b0b619ac64e
Jack He [Thu, 1 Jun 2017 07:08:40 +0000 (07:08 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected" am:
93d7c84726
am:
10cb6f3b4c
Change-Id: I9bd2db9f92866c1e4f62b09fcfd5ad02edcd4e8e
TreeHugger Robot [Thu, 1 Jun 2017 07:07:53 +0000 (07:07 +0000)]
Merge "Temporarily enable HWUI opengl validation"
TreeHugger Robot [Thu, 1 Jun 2017 07:07:18 +0000 (07:07 +0000)]
Merge "Ensure null/empty phone number does not crash international number check." into oc-dev
Jack He [Thu, 1 Jun 2017 07:00:47 +0000 (07:00 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
am:
93d7c84726
Change-Id: I5f0ad1581dd76a8c95dcc52702b0462adc786528
Treehugger Robot [Thu, 1 Jun 2017 06:53:25 +0000 (06:53 +0000)]
Merge "HFP: Allow SCO audio to be forcibly connected"
John Reck [Thu, 1 Jun 2017 06:25:01 +0000 (06:25 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev am:
944b0c73a4
am:
55302e2f4e
Change-Id: Ie4e36cf857fae21261108f2913c10618b8b98d9c
John Reck [Thu, 1 Jun 2017 06:17:58 +0000 (06:17 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev
am:
944b0c73a4
Change-Id: Id9152a19194e1817f83a33b14a6cdccaa84dfeb7
TreeHugger Robot [Thu, 1 Jun 2017 06:11:28 +0000 (06:11 +0000)]
Merge "Fix dequeus outside of frame drawing" into oc-dev
Jack Yu [Thu, 1 Jun 2017 06:00:59 +0000 (06:00 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2 am:
2f74c02826 am:
ce10610a9c
am:
b67a128206 -s ours
Change-Id: I63e6eac2b46aad6999307833b79bf6032a0721fd
Jack Yu [Thu, 1 Jun 2017 05:53:47 +0000 (05:53 +0000)]
Merge "Added video calling data usage per-uid support" am:
36fdb346f2 am:
2f74c02826
am:
ce10610a9c
Change-Id: I0a068e0eb7e833ad28611cf2be1a8bc18d99830a
Jorim Jaggi [Thu, 1 Jun 2017 05:14:44 +0000 (22:14 -0700)]
Remove starting window logging
No evidence so far that the screen-on latency bug hasn't been
fixed yet. Thus, we can remove the logspam.
Test: Inspect logs
Change-Id: I891077b3b8edaa68c748eeef8ecc6469c8eb4a90
Fixes:
62049093
Hugo Benichi [Wed, 17 May 2017 00:26:30 +0000 (09:26 +0900)]
Prettify the captive portal sign-in activity
- fuses url bar with activity header: url is now the subtitle
- url appears as text and not as editable content
- url only shows host name
- header style is the device default for Settings
- Material progress bar
- progress bar disappears at page load finished
- webview does not jump at page load finished
Bug:
62107381
Bug:
38197949
Test: tested by manually triggering the sign-in activity
Change-Id: Id75023acad04f444dbfc41de56814a09e70cc6f9
Phil Weaver [Thu, 1 Jun 2017 01:19:27 +0000 (01:19 +0000)]
Merge "Initialize list of virtual views before using it."
Phil Weaver [Thu, 1 Jun 2017 01:18:31 +0000 (01:18 +0000)]
Merge "Use correct default value for host view."
Fan Zhang [Tue, 30 May 2017 22:20:29 +0000 (15:20 -0700)]
Create icon layout style so custom preferences can reuse
Change-Id: Ice8fcfec391ec2666391073e34dedf8562f19507
Fix:
35961001
Test: builds
Doris Liu [Thu, 1 Jun 2017 01:05:17 +0000 (01:05 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev am:
9057f846ac
am:
4b5d12d25a
Change-Id: I80a1dc2c898a9456b651f6b1375055e6fcb59540
Doris Liu [Thu, 1 Jun 2017 00:57:49 +0000 (00:57 +0000)]
Merge "Ensure start delay is properly scaled with duration scale" into oc-dev
am:
9057f846ac
Change-Id: I124f898f6514a80a0a21682f9f9c21b282e05dde
OSDN Git Service
