Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b14bdbdd74 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-03 06:06:37 +00:00
Bill Yi
d25a7aa7aa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I44cd80a6737bf449e4b12cdd206de5a0926d156a
 2020-09-03 06:01:21 +00:00
Bill Yi
5245bd3515 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I51017567c6733a8b87842e21dbeea23eed04d68f
 2020-09-03 05:16:59 +00:00
TreeHugger Robot
60e40d9c33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd7986c31a -s ours am: 4ec3aa4d09 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618

Change-Id: Ieb1f32339bec7c5739f096a7186a4bbf0343ab4a
 2020-09-03 04:56:21 +00:00
TreeHugger Robot
6e5f5e62a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 552fe692a6 -s ours am: fbeb0ef04f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513765

Change-Id: Ie1038aed951144989d9054177706ed5566913637
 2020-09-03 04:55:46 +00:00
Bill Yi
1a29d74066 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9bf56140e3ab788a4765fc80c4125f90796727a5
 2020-09-03 04:54:48 +00:00
TreeHugger Robot
4ec3aa4d09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd7986c31a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618

Change-Id: I6e1f7cf48e53488a373122b703e264f63ee6d664
 2020-09-03 04:44:12 +00:00
TreeHugger Robot
fbeb0ef04f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 552fe692a6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513765

Change-Id: Ic2de91cc432fd3c058c92c46574148f1f8d9e4d8
 2020-09-03 04:43:12 +00:00
Bill Yi
ecf2ef6303 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I045dad7b97f2d69543c6a5e0b9076b1338915cc9
 2020-09-03 04:32:55 +00:00
TreeHugger Robot
dd7986c31a Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-03 04:23:36 +00:00
TreeHugger Robot
552fe692a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-03 04:23:15 +00:00
Bill Yi
b97b5a3695 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4db25e1e6534c5cae243a1bfbd6d455946d097fd
 2020-09-03 04:11:13 +00:00
Bill Yi
3fb0820353 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idceee1976fa84570b00fa57c8fc62601d4de8ffd
 2020-09-03 03:49:45 +00:00
Bill Yi
8c62892518 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I291b65d265323485c0045de91789c594233d4453
 2020-09-03 03:26:39 +00:00
Siarhei Vishniakou
13257dd7ed Move PropertyMap from libutils to libinput 
Since PropertyMap has moved, update the #include directives.

Bug: 163171599
Test: make only
Change-Id: Ia12463cf80e4d47e0dcaf81104635b2717d28748
 2020-09-02 20:15:40 -07:00
Bill Yi
e902a02b2f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I55ec9fb6c3acdf7a427f47858e47ba1216d35320
 2020-09-03 02:38:38 +00:00
Ned Burns
36d95d4147 Merge "Apply theme by using notification context" am: abca0166d7 am: a5181ef40d am: 1f8f8861cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372978

Change-Id: I52673e7c26279c2c3461b0f8379541c5abbb5b13
 2020-09-03 01:46:25 +00:00
Ned Burns
1f8f8861cf Merge "Apply theme by using notification context" am: abca0166d7 am: a5181ef40d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372978

Change-Id: Ia854218cd6c1b085e103ca39819de862aee40096
 2020-09-03 01:37:09 +00:00
Bill Yi
82ee7672cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If9801d31d19300a14568155f2785b586e9e57b39
 2020-09-03 01:33:30 +00:00
TreeHugger Robot
43662e1979 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3a301e8671 -s ours am: 493592907d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515857

Change-Id: I51f2312fc476482aede79a76af8a64067db463fa
 2020-09-03 01:18:49 +00:00
TreeHugger Robot
3df8d0d16b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bb4b4bdc43 -s ours am: 5718baad64 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890

Change-Id: I2c0cb3e6e3dd162e9dfb9b7a5ba984ed1b6c7f21
 2020-09-03 01:18:31 +00:00
TreeHugger Robot
493592907d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3a301e8671 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515857

Change-Id: I5e797fcc788373e5c5ff7ba4d931ef6946c5f7a9
 2020-09-03 01:18:29 +00:00
Ned Burns
a5181ef40d Merge "Apply theme by using notification context" am: abca0166d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372978

Change-Id: Ia447331ad63737e19d4a9cec3d22deb36fbd72c5
 2020-09-03 01:17:48 +00:00
TreeHugger Robot
3a301e8671 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-03 01:07:47 +00:00
Ned Burns
abca0166d7 Merge "Apply theme by using notification context" 2020-09-03 01:02:20 +00:00
TreeHugger Robot
5718baad64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bb4b4bdc43 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508890

Change-Id: Id639a319ee6a93c992096f00b35b37e00bd4dc48
 2020-09-03 00:53:28 +00:00
TreeHugger Robot
bb4b4bdc43 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-03 00:31:29 +00:00
Bill Yi
b60cd78113 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icfcd108cf57bb9e566a7a5b481b7d2307d374ee8
 2020-09-03 00:28:56 +00:00
Bill Yi
52503cb057 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib02cecde9fcf182cea50d9782fe86b651d03cbf1
 2020-09-03 00:05:49 +00:00
Xin Li
455e36efe2 [automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8be -s ours am: ed22f48840 -s ours 
am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348

Change-Id: Ic485b269579ca470e4b74ee434f1b35110a0ab75
 2020-09-02 23:36:34 +00:00
Bill Yi
31ccff50f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7672d1bacef6d243b623cd0c222cf4e438b65631
 2020-09-02 23:21:32 +00:00
Xin Li
ed22f48840 [automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8be -s ours 
am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348

Change-Id: I735e135e519708d0e1ab07504944ad1dcdfcccbc
 2020-09-02 23:16:43 +00:00
TreeHugger Robot
8323c72f01 Merge "Correctly expose EGL_ANDROID_native_fence_sync to hwui" into rvc-dev-plus-aosp am: 6078830f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12473130

Change-Id: Icc71c41838194286c44232e521b13fd1bca37947
 2020-09-02 22:59:51 +00:00
TreeHugger Robot
6078830f46 Merge "Correctly expose EGL_ANDROID_native_fence_sync to hwui" into rvc-dev-plus-aosp 2020-09-02 22:34:24 +00:00
TreeHugger Robot
ce81c5a420 [automerger skipped] Merge "Fix NavigationBarColorTest" into stage-aosp-master am: cf7c807eea -s ours am: 14aac87b1a -s ours 
am skip reason: Change-Id I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b with SHA-1 588fa46cf4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513856

Change-Id: Iaa2b910bbb6fa3df532949722c86fc3326a51eb5
 2020-09-02 19:40:42 +00:00
TreeHugger Robot
26a58d39ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2b8767c457 -s ours am: c10ee328af -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513831

Change-Id: I2ff62b467b989f634330a458ee48915b4f5bea86
 2020-09-02 19:40:16 +00:00
Xin Li
d8f8dbfd69 [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: d5992421c6 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b
 2020-09-02 19:37:31 +00:00
Xin Li
c8c8e8e8be Merge RP1A.200720.011 
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
 2020-09-02 12:34:37 -07:00
TreeHugger Robot
14aac87b1a [automerger skipped] Merge "Fix NavigationBarColorTest" into stage-aosp-master am: cf7c807eea -s ours 
am skip reason: Change-Id I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b with SHA-1 588fa46cf4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513856

Change-Id: I61bf273a5972b76eec8d0c5a63e9cdc0e249c508
 2020-09-02 19:18:15 +00:00
TreeHugger Robot
c10ee328af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2b8767c457 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513831

Change-Id: I73b8069052bd172a94f80ed85f61481dc78304e3
 2020-09-02 19:17:22 +00:00
Xin Li
d5992421c6 [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90
 2020-09-02 19:15:20 +00:00
TreeHugger Robot
cf7c807eea Merge "Fix NavigationBarColorTest" into stage-aosp-master 2020-09-02 19:10:18 +00:00
TreeHugger Robot
2b8767c457 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 19:05:08 +00:00
Xin Li
5cc3fc4908 Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master 2020-09-02 18:51:46 +00:00
Xin Li
ecbc756f12 Mark RP1A.200720.001 as merged 
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
 2020-09-02 11:44:54 -07:00
TreeHugger Robot
c08dd11c22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f59fa9f9bb -s ours am: b89c6d94c5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512963

Change-Id: I5406e9ab575cd4c84182191c025982c08042081c
 2020-09-02 18:44:50 +00:00
TreeHugger Robot
bf9c988a60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14a9e208c7 -s ours am: 424cf3e399 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12509747

Change-Id: Iaa530a831bf12b8a57539e3a5098fd281c196911
 2020-09-02 18:44:15 +00:00
TreeHugger Robot
b89c6d94c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f59fa9f9bb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512963

Change-Id: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
 2020-09-02 18:18:33 +00:00
TreeHugger Robot
424cf3e399 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14a9e208c7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12509747

Change-Id: I7630ce8afdcb75b72ac94eef7cb41a052979f140
 2020-09-02 18:16:56 +00:00
TreeHugger Robot
f59fa9f9bb Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 18:14:53 +00:00