Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
756,544 Commits 3 Branches 0 Tags
4d150d5e1e4f7734928e42fbc06beee4d9dc536e
Commit Graph

756544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Elliott
4d150d5e1e Merge "Prune summaries if only group children filtered" into tm-dev 2022-04-07 19:10:44 +00:00
TreeHugger Robot
6761700526 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 31726f2f8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaaa97506cdd2b1f6b14d228a792d2f3d5aebae6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:35:54 +00:00
Bill Yi
4c8f9cde68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3607f76a3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01426bb16606e48b7c5e9283fdfa029b99043683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:35:42 +00:00
TreeHugger Robot
0a608d6eab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3bebf0f0b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42683571f29b55737da2f5fc6a3898bb9485c92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:34:39 +00:00
Bill Yi
8a894f721b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7912cb275c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c22a2356ecd277cc4ef36293671aee23ae053ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:34:06 +00:00
TreeHugger Robot
577d95e923 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2fba695587 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice4144432383bef9ace490fee65c3559f67ca27c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:33:09 +00:00
Bill Yi
4c31686a09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d3bd9a740 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9dc8c66663fc915698aff96bda21d90a4f282871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:32:58 +00:00
TreeHugger Robot
31726f2f8f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 18:21:42 +00:00
TreeHugger Robot
3bebf0f0b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 18:10:57 +00:00
TreeHugger Robot
2fba695587 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 18:10:54 +00:00
Jason Chang
118e6bacdb Merge "Fix One-handed mode tutorial broken on large screen device" into tm-dev 2022-04-07 18:10:11 +00:00
TreeHugger Robot
aa1b95a346 Merge "Align footer actions with notif background" into tm-dev 2022-04-07 18:09:07 +00:00
TreeHugger Robot
a6713ec97e Merge "Use single line header in landscape handheld" into tm-dev 2022-04-07 17:56:40 +00:00
Jing Ji
b0d14a0ee5 Merge "Update the PendingIntent to launch Settings on bg restriction alert" into tm-dev 2022-04-07 17:56:36 +00:00
Aaron Liu
f2acd2040e Merge "[Fix settings] Multi user for settings wrapper" into tm-dev 2022-04-07 17:46:26 +00:00
TreeHugger Robot
d78c757088 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3ca83af4e6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I869b58e9b21c84e65da65c64d225f207f364cfab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:26:27 +00:00
Bill Yi
bb1400f046 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33a2dc0759 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebed3378f51a2e25eb0b0dd44061e43fa14e8ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:26:11 +00:00
TreeHugger Robot
f9a5e6183d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8f23622068 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96e20619bc0438a0defcdac307276cf860e7a65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:29 +00:00
TreeHugger Robot
2dbaec6a9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: b727ae21be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6e6e2217900edfc72652f5cd4d4db154f5ebfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:12 +00:00
Automerger Merge Worker
f3bb0302a2 [automerger skipped] Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 am: a5d599f7b6 -s ours 
am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 4f319df8ff is already in history

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

Change-Id: I3440da84492a66ce18b9dce52340374a3effb5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:09:07 +00:00
TreeHugger Robot
7e82159774 [automerger skipped] Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev am: 196fc30c20 am: 466149ed70 -s ours 
am skip reason: Merged-In I57c57cbb156dae79fa46e917285330f07ff7edce with SHA-1 432e035300 is already in history

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

Change-Id: Ie3c51425c24b2f96a1fd65799296c95885e8fa5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:08:28 +00:00
TreeHugger Robot
3ca83af4e6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:00:19 +00:00
TreeHugger Robot
8f23622068 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 16:59:15 +00:00
TreeHugger Robot
bf850d65a8 Merge changes from topic "presubmit-am-bceb8e4e168541e88503e0f69150fe98" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6b561ac844
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 16:59:15 +00:00
TreeHugger Robot
b727ae21be Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 16:59:11 +00:00
TreeHugger Robot
1b593cabb1 Merge changes from topic "presubmit-am-5d0b5ec753a44b1cb74d9f24a3e843e8" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 778b3f9176
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 16:59:11 +00:00
Automerger Merge Worker
a5d599f7b6 Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev am: a18c3121d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I0c82fda5497bace30d49989b8e84ebc98250ca8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:48:36 +00:00
TreeHugger Robot
466149ed70 Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev am: 196fc30c20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17529131

Change-Id: I8e1e077644160f89e7ad1b9ad553e7cf62de20b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:47:10 +00:00
Chavi Weingarten
0e11b2c738 Merge "Update IME SECURE flag if Window updates SECURE flag" into tm-dev 2022-04-07 16:44:54 +00:00
Hui Yu
f3e8d88277 Merge "Null check on BroadcastRecord's receivers list." into tm-dev 2022-04-07 16:34:16 +00:00
Automerger Merge Worker
a18c3121d7 Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev 2022-04-07 16:33:17 +00:00
TreeHugger Robot
196fc30c20 Merge "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev 2022-04-07 16:33:08 +00:00
Remi NGUYEN VAN
0684759f10 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: c14e995495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ifb8d0d20243e35601011eedb9442594f24067fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:33:03 +00:00
Remi NGUYEN VAN
b597282629 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 am: 1ee4525e72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ib518f7035cab1c669292c137d8f7b560d19b8a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:33:00 +00:00
Remi NGUYEN VAN
c14e995495 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: Ie1230d9ce9e590b6174ce9d28cc0106d0058b64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:11:58 +00:00
Remi NGUYEN VAN
1ee4525e72 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d am: 2f74509789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I4bac4cc8375278d29b4cdf3dc380cde5559a7e48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 16:10:58 +00:00
Remi NGUYEN VAN
2f74509789 Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 15:56:13 +00:00
Remi NGUYEN VAN
49f031ea4d Disallow PAP authentication when MPPE is requested am: 4f319df8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780

Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 15:39:14 +00:00
Songchun Fan
6346fb8aa2 Merge "Revert "Revert "[AppsFilter] read-only interface for snapshots""" into tm-dev 2022-04-07 15:25:07 +00:00
Luca Zuccarini
6a6305969f Merge "Remove the temporary bounds workaround from ViewBoundAnimator." into tm-dev 2022-04-07 15:06:06 +00:00
Vania Desmonda
7bc8a3988b Merge "Enable feature flag to show "Turns on at bedtime" as a Schedule in Dark theme Settings page." into tm-dev 2022-04-07 15:01:31 +00:00
Miguel Aranda
94b8687974 Merge "Add first set of libcore benchmarks to the System Health CB framework." am: e01a01ca3e am: c7fda7b570 am: 5b96793af5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1986426

Change-Id: If512729ba53b711e03ed3241d872df92cde69d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 15:00:55 +00:00
Miguel Aranda
5b96793af5 Merge "Add first set of libcore benchmarks to the System Health CB framework." am: e01a01ca3e am: c7fda7b570 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1986426

Change-Id: I8c987aec63b108fe9aa267532fdf9a75eb8f2d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:40:46 +00:00
Evan Laird
756f7b4e91 Merge "Use background call for BatteryController#init()" into tm-dev 2022-04-07 14:30:54 +00:00
Nathalie Le Clair
c325e0fc57 Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" am: f4c40e0b0b am: 6a47166d50 am: a1b57ae256 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566053

Change-Id: I080621c2c0845ac23074cc66d13509a6cd370080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:22:29 +00:00
Miguel Aranda
c7fda7b570 Merge "Add first set of libcore benchmarks to the System Health CB framework." am: e01a01ca3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1986426

Change-Id: Iae1a66165221f45051be17c4d047b5bd5be3999b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:21:58 +00:00
Nathalie Le Clair
a1b57ae256 Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" am: f4c40e0b0b am: 6a47166d50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566053

Change-Id: I9d3fce190d3449dabd24862a8eb8d0d6f944a0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:16:09 +00:00
TreeHugger Robot
67bb5cec83 Merge "Fix touchable region calculation in NavigationBarController" into tm-dev 2022-04-07 14:04:29 +00:00
Miguel Aranda
e01a01ca3e Merge "Add first set of libcore benchmarks to the System Health CB framework." 2022-04-07 14:01:23 +00:00
Shawn Lin
c5c2322583 [automerger skipped] Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev am: 88af43ac60 -s ours am: a3c90b5bb6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2b1749d28949aded024a695f4c6f9e0e3cd0c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:01:22 +00:00