Adrian Roos
bad8de914a
WM: Add debug information proto definition from other branch
...
To make sure that the proto definitions stay in sync across branches,
we merge them to master even though the logic for this does not exist
here.
Bug: 111062294
Test: make droid
Change-Id: I2521cfde6cdc04644666eff753226d6d008d378f
2018-07-09 12:08:31 +00:00
Wesley Wang
0f18470ed3
Merge "Fix Power menu background vanish"
2018-07-09 06:05:12 +00:00
Wesley.CW Wang
42feebee6f
Fix Power menu background vanish
...
- Separated button & origin button use same HardwareBgDrawable caused
power menu background vanish when keyboard showing.
- Let separated button use mSeparatedViewBackground & origin button use
mListBackground to fix this bug.
- Rename View mChild to mList.
Test: Manually, long press power key to launch power menu when keyboard
showing, power menu background should display normally.
Bug: 111101759
Change-Id: Ic08cabc63daebc4001c8eda751857d11cb0e6352
2018-07-09 12:18:08 +08:00
TreeHugger Robot
d9afa50863
Merge "Revert "Add UrlSpanFactory to Linkify""
2018-07-08 00:10:34 +00:00
Ian Pedowitz
0a35c20bc3
Revert "Add UrlSpanFactory to Linkify"
...
This reverts commit ad4883bb1b
2018-07-07 22:02:29 +00:00
TreeHugger Robot
90671be751
Merge "Update OWNERS file"
2018-07-07 02:22:38 +00:00
Siyamed Sinir
060828e616
Merge "Add UrlSpanFactory to Linkify"
2018-07-07 00:57:35 +00:00
Andrew Solovay
ab69580fb2
Merge "docs: Typo fixes"
2018-07-07 00:55:34 +00:00
Lucas Dupin
9a0b6dcd5c
[automerger skipped] Merge "Hide windows even when AOD is off" into pi-dev am: 5c75b5b60e
...
am: 4b6d16696f
2018-07-06 15:34:20 -07:00
Lucas Dupin
4b6d16696f
Merge "Hide windows even when AOD is off" into pi-dev
...
am: 5c75b5b60e
2018-07-06 15:23:30 -07:00
TreeHugger Robot
5c75b5b60e
Merge "Hide windows even when AOD is off" into pi-dev
2018-07-06 22:10:50 +00:00
Andrew Solovay
4b92a8c02e
docs: Typo fixes
...
Misc. typo fixes, just to XML comments (for Javadocs).
Staged to:
http://go/dac-stage/reference/android/view/ViewGroup.html#attr_android:persistentDrawingCache
Test: make ds-docs
Bug: 37140564
Bug: 38269885
Change-Id: I1f61353166d1c4d63501dd930e6d76abe47a8b47
2018-07-06 14:03:53 -07:00
Jordan Liu
d75e31fbce
Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7 am: 50f29d8ecf
...
am: bf4acfb71b
2018-07-06 12:25:08 -07:00
Jordan Liu
bf4acfb71b
Merge "Type Allocation Code & Manufacturer Code" am: ff801e5fd7
...
am: 50f29d8ecf
2018-07-06 12:15:49 -07:00
Jordan Liu
50f29d8ecf
Merge "Type Allocation Code & Manufacturer Code"
...
am: ff801e5fd7
2018-07-06 12:06:39 -07:00
Jordan Liu
ff801e5fd7
Merge "Type Allocation Code & Manufacturer Code"
2018-07-06 17:51:42 +00:00
zhouwenjie
d707da9c77
Upate BatteryStats version after fixing mMinLearnedBatteryCapacity
...
calculation.
Bug: 111132682
Test: manual
Change-Id: Ie2964bbc8480c8758b7b54e25ec9e95a329a2285
2018-07-06 10:26:51 -07:00
TreeHugger Robot
69a144a873
Merge "Transforms uid to packages for the raw data"
2018-07-06 17:17:15 +00:00
Neil Fuller
47d79db2b8
resolve merge conflicts of 7980b19bc8 to stage-aosp-master am: 3147288c3b
...
am: f53c7a2ae5
2018-07-06 10:05:44 -07:00
Neil Fuller
f53c7a2ae5
resolve merge conflicts of 7980b19bc8 to stage-aosp-master
...
am: 3147288c3b
2018-07-06 09:59:52 -07:00
TreeHugger Robot
31b10bdf90
Merge "MediaPlayer2: merge EventHandler with TaskHandler"
2018-07-06 15:47:23 +00:00
Neil Fuller
3147288c3b
resolve merge conflicts of 7980b19bc8 to stage-aosp-master
...
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica0d3578c6e3fcd17b350f63b4acd471774ac014
2018-07-06 16:32:44 +01:00
Olivier Gaillard
d202011c37
Transforms uid to packages for the raw data
...
Test: manual
Change-Id: I8d6ef245bb42a1f1c058dc43e23e82f2a8b70264
2018-07-06 16:10:44 +01:00
Treehugger Robot
7980b19bc8
Merge "Track changes in libcore to remove a constructor"
2018-07-06 13:58:29 +00:00
Bill Yi
8826be878b
Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8 am: 6dc57344d6
...
am: 4fc0ab5d7f
2018-07-06 01:58:28 -07:00
Bill Yi
11911ed381
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours am: 648f0b4c44 -s ours
...
am: 1beddd17c3
2018-07-06 01:48:02 -07:00
Bill Yi
d4c9bbfe6b
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82 am: b5334fff17
...
am: 6275ee519c
2018-07-06 01:41:27 -07:00
Bill Yi
1ee330385a
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours am: 0ae92cd7fa -s ours
...
am: 611fb78256
2018-07-06 01:31:10 -07:00
Bill Yi
4fc0ab5d7f
Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8
...
am: 6dc57344d6
2018-07-06 01:25:24 -07:00
Bill Yi
1beddd17c3
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours am: c1a9ad2a19 -s ours
...
am: 648f0b4c44
2018-07-06 01:15:58 -07:00
Bill Yi
7ed0564718
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03 am: d91868aee5
...
am: 539952c444
2018-07-06 00:58:10 -07:00
Bill Yi
6275ee519c
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49 am: f9a749eb82
...
am: b5334fff17
2018-07-06 00:57:55 -07:00
Bill Yi
611fb78256
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours am: 1080ba61c3 -s ours
...
am: 0ae92cd7fa
2018-07-06 00:48:40 -07:00
Bill Yi
4e6e5745da
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours am: 8dfe2e787c -s ours
...
am: dff3f6a527
2018-07-06 00:47:24 -07:00
Bill Yi
539952c444
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03
...
am: d91868aee5
2018-07-06 00:42:28 -07:00
Bill Yi
37fbc3081e
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59 am: cd74671aa7
...
am: 5b29095f7d
2018-07-06 00:39:40 -07:00
Bill Yi
dff3f6a527
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours am: 9bf5cb9b7f -s ours
...
am: 8dfe2e787c
2018-07-06 00:33:24 -07:00
Bill Yi
e122218521
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours am: 84729fca53 -s ours
...
am: 87829f5f24
2018-07-06 00:29:19 -07:00
Bill Yi
5b29095f7d
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59
...
am: cd74671aa7
2018-07-06 00:27:06 -07:00
Bill Yi
2d117c2942
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 am: 12835665f3
...
am: 3fab85bffd
2018-07-06 00:19:04 -07:00
Bill Yi
87829f5f24
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb -s ours am: 67f18d810a -s ours am: d635022d93 -s ours
...
am: 84729fca53
2018-07-06 00:18:14 -07:00
Bill Yi
c98323a0c3
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5 -s ours am: fcca5bb731 -s ours am: d18e450922 -s ours am: 8944491476 -s ours
...
am: 9969f29b47
2018-07-06 00:08:45 -07:00
Bill Yi
6dc57344d6
Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787
...
am: 199b3ee0d8
2018-07-05 23:40:19 -07:00
Bill Yi
648f0b4c44
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144 -s ours am: bf6bbefe57 -s ours
...
am: c1a9ad2a19
2018-07-05 23:32:52 -07:00
Bill Yi
b5334fff17
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into oc-dev am: 72e16b1754 am: af687adf49
...
am: f9a749eb82
2018-07-05 23:25:25 -07:00
Bill Yi
0ae92cd7fa
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168 am: a05627322f -s ours am: a8276b8de4 -s ours
...
am: 1080ba61c3
2018-07-05 23:17:39 -07:00
Bill Yi
d91868aee5
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783
...
am: e2a7c24f03
2018-07-05 23:12:01 -07:00
Bill Yi
8dfe2e787c
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134 -s ours am: f2ea6f55d9 -s ours
...
am: 9bf5cb9b7f
2018-07-05 23:04:17 -07:00
Bill Yi
cd74671aa7
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169
...
am: 086abb7a59
2018-07-05 22:38:26 -07:00
Bill Yi
199b3ee0d8
Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea
...
am: 7557661787
2018-07-05 22:36:46 -07:00
