Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
640,038 Commits 3 Branches 0 Tags
9c1f4e12c90f36ffb8d0840c2ea17cc2270324ef
Commit Graph

640038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff DeCew
9c1f4e12c9 Show minimized header text with the correct text weight 
Fixes: 184863420
Test: visual
Change-Id: Ic16f9e88e118e7ea5fe14054cf1c35318d4a6ddd
 2021-05-11 17:10:34 -04:00
TreeHugger Robot
ec6c6835ca Merge "Promote stable flicker tests" into sc-dev 2021-05-10 13:39:52 +00:00
Jeff DeCew
0601cb9bd7 Merge "Remove exception whe Colorized notificiation uses COLOR_DEFAULT." into sc-dev 2021-05-10 13:29:08 +00:00
Nataniel Borges
4f741f2e89 Promote stable flicker tests 
Move:
- Stable postsubmit to presubmit
- Stable flaky to postsubmit

Bug: 186115871
Test: atest FlickerTests WMShellFlickerTests
Change-Id: Ia4b1a4868595d6f9c5134e92851664137d79098e
 2021-05-10 14:05:15 +02:00
Chalard Jean
0d88f8065d Merge "Allow network providers to set yield to bad wifi" into sc-dev 2021-05-10 12:02:00 +00:00
Fiona Campbell
6a2953601b Merge "Save display persistent data store" into sc-dev 2021-05-10 11:00:22 +00:00
Anton Hansson
c2baf8f5e4 [automerger skipped] Merge "Add targets to build doc-stubs for non-updatable" am: ee95f486e5 am: 288898968d am: c2603116e7 -s ours 
am skip reason: Merged-In Ic2cef748c42c141ea42b8cd7b4afd7ee78a1399d with SHA-1 867f94c755 is already in history

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

Change-Id: I7208d67f45df60af9d8c81cc2c9138cb0dbf2b5c
 2021-05-10 10:02:54 +00:00
Anton Hansson
c2603116e7 Merge "Add targets to build doc-stubs for non-updatable" am: ee95f486e5 am: 288898968d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697266

Change-Id: I9ee3bbc9c0e21b23ef2cc0c38e2254da9f28c925
 2021-05-10 09:43:50 +00:00
Anton Hansson
288898968d Merge "Add targets to build doc-stubs for non-updatable" am: ee95f486e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697266

Change-Id: Ibdcd1144da22d8a2a76003540d2023e53cd680e6
 2021-05-10 09:21:08 +00:00
Chalard Jean
c4660c98f6 Allow network providers to set yield to bad wifi 
While the "yield to bad wifi" policy is handled by CS for
backward compatibility, the network provider should in
fact be in control of it. There is no downside to allowing
providers to set it as no provider is using this, and it
will allow for migration in the future. The code is also
simpler, and becomes possible to test through CTS.

Test: NetworkScoreTest
Bug: 184037351
Change-Id: I3b2418f37bf1f0374d0a626fda7e2b6f3a3b41ba
 2021-05-10 08:55:19 +00:00
Anton Hansson
ee95f486e5 Merge "Add targets to build doc-stubs for non-updatable" 2021-05-10 08:55:07 +00:00
Ilya Matyukhin
22f83b56f7 Merge "Split onPointerDown to onPointerDown and onUiReady" into sc-dev 2021-05-10 07:36:14 +00:00
TreeHugger Robot
9f60cc780d Merge "Set PreferenceThemeOverlay as preferenceTheme in Theme.SubSettingsBase on R." into sc-dev 2021-05-10 06:42:00 +00:00
TreeHugger Robot
a83514ecfb Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:38 +00:00
Bill Yi
393c625a54 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-10 03:43:11 +00:00
Hai Zhang
8566a26429 Set PreferenceThemeOverlay as preferenceTheme in Theme.SubSettingsBase 
on R.

Setting preferenceTheme is needed for using AndroidX preference, and the
S+ version of the theme is setting the S+ PreferenceTheme.SettingsLib as
well. So set the vanilla AndroidX PreferenceThemeOverlay as
preferenceTheme on R.

Bug: 177638625
Test: presubmit
Change-Id: Icbf676849e31619a1192b4f1724a5d2932650e06
 2021-05-10 03:26:25 +00:00
Riddle Hsu
5959d504be Merge "Allow screen rotation animation when entering AOD" into sc-dev 2021-05-10 02:42:52 +00:00
Paul Hu
f95a681249 Merge "Add missed break" am: e01bb41ad7 am: 6a860236e6 am: 61986f2f76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696667

Change-Id: Ic1fe036bf1bb6429c361aa187347c06190b81b07
 2021-05-10 02:34:35 +00:00
Paul Hu
61986f2f76 Merge "Add missed break" am: e01bb41ad7 am: 6a860236e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696667

Change-Id: I418b1d529c40b687f4e2e1a895f993e49f215ac6
 2021-05-10 02:15:43 +00:00
Paul Hu
6a860236e6 Merge "Add missed break" am: e01bb41ad7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696667

Change-Id: Ib10bcffe1bbf74f38026ab62c40448ebf1181d08
 2021-05-10 01:58:33 +00:00
Paul Hu
e01bb41ad7 Merge "Add missed break" 2021-05-10 01:42:24 +00:00
TreeHugger Robot
018510f032 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 975703475a -s ours am: 53e3ae84a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica4b6ce68415d983b67b73d0e1afd21f48deff98
 2021-05-09 21:52:10 +00:00
TreeHugger Robot
1c612f20d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6b548ec3b7 -s ours am: b17b1bf2df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I719e3ebbc1d9153989de1be7805d0f589e238b15
 2021-05-09 21:51:58 +00:00
Bill Yi
265639955a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2912acc8e7 -s ours am: 7d6dad97d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I373b2e901c29bb3facaa2d3825cae6a53b71a4b1
 2021-05-09 21:51:26 +00:00
TreeHugger Robot
7a3a5e5267 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d2f9ad2472 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I047fc1544cc6719e2bbf9e2e9c24f44d0668cdd5
 2021-05-09 21:23:37 +00:00
TreeHugger Robot
d429d1bc56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 44f86c10cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e0d54954d6823c17811c5fc5252b8a989da7dcf
 2021-05-09 21:23:23 +00:00
Bill Yi
ebadc46fd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d69a15d8e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00c0d5cd58a8ce40f81f798728290c5f4b67d248
 2021-05-09 21:23:11 +00:00
TreeHugger Robot
53e3ae84a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 975703475a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8252cbd39c7889707e5096e0b03c834732068494
 2021-05-09 21:03:22 +00:00
TreeHugger Robot
b17b1bf2df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6b548ec3b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I878eaa677c191325080a6c4790b310e5bbd5cb46
 2021-05-09 21:03:09 +00:00
Bill Yi
7d6dad97d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2912acc8e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65f71ee91cb3a406fe39e7c49a510b23fe78d7bf
 2021-05-09 21:02:34 +00:00
TreeHugger Robot
d2f9ad2472 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-09 20:49:44 +00:00
TreeHugger Robot
44870ad9f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:48:45 +00:00
TreeHugger Robot
975703475a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-09 20:44:28 +00:00
TreeHugger Robot
44f86c10cc Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-09 20:42:58 +00:00
Ruslan Tkhakokhov
c4646c09ba Merge "Don't restore notification channel if its sound is unavailable" into sc-dev 2021-05-09 20:36:02 +00:00
TreeHugger Robot
e52318e0bf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:30:21 +00:00
TreeHugger Robot
6b548ec3b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-09 20:30:08 +00:00
Hyunyoung Song
048fc0ae1a Merge "All Apps Search API council feedback (second round)" into sc-dev 2021-05-09 19:05:04 +00:00
Mark Chien
81bd9d9b30 Merge "startTethering with silent entitlement in systemui" am: 20df56adb7 am: 0762ef2d94 am: 3771cea157 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450641

Change-Id: I7d7822d8a3a8a4399524fc715ff3746d1396a2ae
 2021-05-09 18:14:21 +00:00
Mark Chien
3771cea157 Merge "startTethering with silent entitlement in systemui" am: 20df56adb7 am: 0762ef2d94 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450641

Change-Id: Idde4eedc529b4e4c41e4872fc3d2b03d4ad72288
 2021-05-09 17:28:08 +00:00
Mark Chien
0762ef2d94 Merge "startTethering with silent entitlement in systemui" am: 20df56adb7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450641

Change-Id: I3b02c54c3c72883354a1ab5d0bee93747f39d021
 2021-05-09 16:47:23 +00:00
James Lin
6bf12e128b Merge "Add carrier config for the SIP 486 request forbidden and add API for SHELL command to remove the UCE requests cannot be sent the network status." am: 011be0d15a am: b776230e12 am: 50c3a90cb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689574

Change-Id: If268eafc96cf72b9e241290952fc2d005001ea8e
 2021-05-09 16:34:36 +00:00
Mark Chien
20df56adb7 Merge "startTethering with silent entitlement in systemui" 2021-05-09 16:16:55 +00:00
Lorenzo Colitti
fd653deee6 Merge "Rename unwanted capabilities to forbidden capabilities." into sc-dev 2021-05-09 16:12:56 +00:00
James Lin
50c3a90cb3 Merge "Add carrier config for the SIP 486 request forbidden and add API for SHELL command to remove the UCE requests cannot be sent the network status." am: 011be0d15a am: b776230e12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689574

Change-Id: Idf731b0b9ee15a4bb85677cc368b6271ba873bf4
 2021-05-09 15:41:09 +00:00
James Lin
b776230e12 Merge "Add carrier config for the SIP 486 request forbidden and add API for SHELL command to remove the UCE requests cannot be sent the network status." am: 011be0d15a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689574

Change-Id: Ib4a7943198cf2e145f065a4244b397acab206b42
 2021-05-09 14:39:01 +00:00
James Lin
011be0d15a Merge "Add carrier config for the SIP 486 request forbidden and add API for SHELL command to remove the UCE requests cannot be sent the network status." 2021-05-09 13:50:14 +00:00
Bill Yi
97d8a1a9ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I837da7b52a45d1b51a4cd60aa09de5cddd52b7a6
 2021-05-09 04:44:21 -07:00
Bill Yi
2912acc8e7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5fb0216d33dca2249845b2da974c9743a1479f0b
 2021-05-09 04:29:36 -07:00
Bill Yi
7d2b53554b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic3baeb476061f3001f571e5b4385bd95b7a42b30
 2021-05-09 04:17:54 -07:00