Commit Graph

10920 Commits

Author SHA1 Message Date
Treehugger Robot
2999ac25fb Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380 am: 187863655c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: I65f147d6f81268b215338bd40a138227ff8befa4
2021-11-09 18:28:20 +00:00
Treehugger Robot
187863655c Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: Icc99c2717305e6a17f04e1ca9651973491cb907b
2021-11-09 18:07:18 +00:00
Treehugger Robot
2512fc7380 Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: I4dd38f5ba292d74d1660007374ad38d113782981
2021-11-09 17:47:08 +00:00
Yurii Zubrytskyi
4c87aec35f Update the resources owner files
Bug: 205633893
Test: n/a

Change-Id: Ib9cf70c9acb200e8019a6522cb6a85f85b760651
2021-11-08 16:25:33 -08:00
Chris Li
4a955cf3ee Merge "Check app targetSdkVersion when check minWidth/Height for multi window" into sc-v2-dev am: 73da25c96b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16169728

Change-Id: Ie2154ce87fb99535a2b8b007d1531164863dbfa4
2021-11-08 02:24:02 +00:00
Chris Li
8e47bf7a9f Check app targetSdkVersion when check minWidth/Height for multi window
Bug: 197654537
Test: manually with app target S- with large min width/height
Change-Id: I2dd0902cb255cbe111ebab86dbf59be1a32e0cfc
2021-11-03 17:26:22 +08:00
Treehugger Robot
904b1d5f79 Merge "Consolidating PM owner definition and adding new owners." am: 75e0091067 am: e32f384ce7 am: db319657ed am: 3af00e82f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863214

Change-Id: Ifa00c01598167329e27d69d7f1af8ff549b3b03a
2021-10-26 20:20:58 +00:00
Treehugger Robot
3af00e82f8 Merge "Consolidating PM owner definition and adding new owners." am: 75e0091067 am: e32f384ce7 am: db319657ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863214

Change-Id: I4d3a530dc02b5258c9b040d34cdc310b3cba9304
2021-10-26 20:02:31 +00:00
Treehugger Robot
db319657ed Merge "Consolidating PM owner definition and adding new owners." am: 75e0091067 am: e32f384ce7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863214

Change-Id: I66e4e0c68812b58fd414652e80797444f86d5821
2021-10-26 19:36:39 +00:00
Treehugger Robot
75e0091067 Merge "Consolidating PM owner definition and adding new owners." 2021-10-26 18:39:51 +00:00
Treehugger Robot
92bf843da4 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079 am: 170597987c am: fddbf6e930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: I162c539a488e0977817a259098ef83694879fcf4
2021-10-26 16:27:38 +00:00
Treehugger Robot
fddbf6e930 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079 am: 170597987c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: I20da6815471e8e19813d16f9785d3238d29e46c1
2021-10-26 16:12:59 +00:00
Treehugger Robot
170597987c Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" am: 168b5655a4 am: a3b55d5079
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869964

Change-Id: Ic29bd0608b8a1edafc30834889f99107a5bfb9da
2021-10-26 15:58:18 +00:00
Treehugger Robot
168b5655a4 Merge "Revert "Removed BluetoothDevice#prepareToEnterProcess"" 2021-10-26 15:32:33 +00:00
Etienne Ruffieux
255c70fbbc Revert "Removed BluetoothDevice#prepareToEnterProcess"
This reverts commit e8f2077fee.

Reason for revert: Introducing regression for gms core

Test: None
Change-Id: I644b10c1869c12e1622300de43bfbdb57fb583d8
2021-10-25 21:42:17 +00:00
Tom Natan
a381de9cb8 Merge "Apply min aspect ratio override only for portrait only activities" into sc-v2-dev am: 59f0a73009
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16063814

Change-Id: Iceaa0a79aec1f574450166afef1e72e8ad5157a2
2021-10-25 09:30:27 +00:00
Tom Natan
59f0a73009 Merge "Apply min aspect ratio override only for portrait only activities" into sc-v2-dev 2021-10-25 09:16:38 +00:00
Makoto Onuki
61c9ccc55c Merge "Fix javadoc on Context.startForegroundService" into sc-v2-dev am: ca3316df61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16095147

Change-Id: Ifeb51594e4ba48d0aa74b448cc773814a91b3bc3
2021-10-21 15:25:58 +00:00
tomnatan
4674792ad6 Apply min aspect ratio override only for portrait only activities
This only affects the min aspect ratio override, developers can still set min aspect ratio in the manifest regadless of whether the app is fixed to portrait. This change is needed since applying the override on activities that aren't fixed to portrait results in unintended behavior (see bug for more context).

Fix: 202842551
Test: atest WmTests:SizeCompatTests
Change-Id: Iebd8edf1fc43ee892aea78715c9b217950df5a3b
2021-10-20 22:58:13 +00:00
Makoto Onuki
f61a9d76e1 Fix javadoc on Context.startForegroundService
Bug: 203664384
Bug: 142968927
Test: treehugger
Change-Id: Ie3ba7d9fd5cda034f2ef8fab79630cfb15d6bb13
2021-10-20 21:45:06 +00:00
Patrick Baumann
8255f5f4c0 Consolidating PM owner definition and adding new owners.
Change-Id: If4b080755701452c53d55f26380e887dc3944dbf
2021-10-19 21:06:56 +00:00
Treehugger Robot
47b3a1d69e Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21 am: 881188aec1 am: 5ee34126e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: I3c09d03f89dc70363dca395c677a27b77c1bf708
2021-10-18 22:33:58 +00:00
Treehugger Robot
5ee34126e5 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21 am: 881188aec1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: I40e1ab47302e382037e42fb4f456fd15ef1d7576
2021-10-18 22:18:05 +00:00
Treehugger Robot
881188aec1 Merge "Removed BluetoothDevice#prepareToEnterProcess" am: e722500621 am: 8bc4a18d21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856313

Change-Id: Icfb47bbfd6a04323343d93cc4a7f636bc6c1f280
2021-10-18 22:05:26 +00:00
Treehugger Robot
e722500621 Merge "Removed BluetoothDevice#prepareToEnterProcess" 2021-10-18 21:37:57 +00:00
Treehugger Robot
ba48efd251 Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 am: dd769fedab am: 821bb80688
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: I22b542ada2d4126d4a4f20dc459f4624c9320ddc
2021-10-18 03:26:18 +00:00
Treehugger Robot
821bb80688 Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861 am: dd769fedab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Iff381892048ab02b6df2d92dc8d2c687b9f7bc88
2021-10-18 03:11:49 +00:00
Treehugger Robot
dd769fedab Merge "Fix Configuration.diff documentation." am: f822fdf129 am: 1017b74861
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: Ib73d56621f5ba8f01917443a9aa1dd78812aa72c
2021-10-18 02:59:24 +00:00
Etienne Ruffieux
e8f2077fee Removed BluetoothDevice#prepareToEnterProcess
Tag: #feature
Bug: 200202780
Test: manual
Change-Id: I8d4be1da1bcb5b819c324f1a3a89c7dc317c31d6
2021-10-15 14:41:32 +00:00
Felka Chang
6829841745 Fix Configuration.diff documentation.
By using ActivityInfo.Config to annotate the return type of
Configuration.diff, it not only solves the wrong document but also
makes the documentation of Configuration.diff consist with
the documentation of Configuration.updateFrom.

The final result is the following.
```
Returns a bit mask indicating which configuration values have changed.
Value is either 0 or a combination of ActivityInfo.CONFIG_MCC,
ActivityInfo.CONFIG_MNC, ActivityInfo.CONFIG_LOCALE,
ActivityInfo.CONFIG_TOUCHSCREEN, ActivityInfo.CONFIG_KEYBOARD,
ActivityInfo.CONFIG_KEYBOARD_HIDDEN, ActivityInfo.CONFIG_NAVIGATION,
ActivityInfo.CONFIG_ORIENTATION, ActivityInfo.CONFIG_SCREEN_LAYOUT,
ActivityInfo.CONFIG_UI_MODE, ActivityInfo.CONFIG_SCREEN_SIZE,
ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE, ActivityInfo.CONFIG_DENSITY,
ActivityInfo.CONFIG_LAYOUT_DIRECTION, ActivityInfo.CONFIG_COLOR_MODE,
and ActivityInfo.CONFIG_FONT_SCALE
```

Test: make docs
Test: review reference/android/content/res/Configuration.html in
      out/target/common/docs/online-sdk-docs-docs.zip

Fixes: 171738297
Bug: 171716892
Change-Id: Iaa2ac25bc1269e4a9a625cce386f51984ffff923
2021-10-13 20:50:03 +08:00
Treehugger Robot
3adc4cd7ed Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948 am: 7b03023777
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I4869c4f65d882144b7fbc964ebee1201fe0887b9
2021-10-06 13:10:23 +00:00
Treehugger Robot
7b03023777 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: Ib1f1a23a5e3fcac9691db094f79e63b4415546b3
2021-10-06 12:55:15 +00:00
Treehugger Robot
cb329ca948 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I598b562401860e5e838f891eb2944e49becc2fe6
2021-10-06 12:35:43 +00:00
Treehugger Robot
3aaf984908 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I0aef93d99d83f20b22753e8e1d41cfb5c4b5cdce
2021-10-06 12:25:47 +00:00
Treehugger Robot
3ad4ecc296 Merge "Avoid full unparcelling where possible in Bundle" 2021-10-06 12:06:59 +00:00
Treehugger Robot
043511f0b2 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f am: 407c8c4fc5 am: 5476b13b48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Idd38d5ace1c3ababf5218f07d1f5c29bf174efed
2021-10-05 23:26:11 +00:00
TreeHugger Robot
0ad7eb2673 Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36 am: f81f06da29 am: c786f0e5ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: I24c6ce1d2ec444f75bdcb5e814d0b0c7975ac0a9
2021-10-05 23:23:32 +00:00
Treehugger Robot
5476b13b48 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f am: 407c8c4fc5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Id6878f9cd849ec9ce6b2c582f5a640ef185774cf
2021-10-05 23:21:57 +00:00
TreeHugger Robot
c786f0e5ae Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36 am: f81f06da29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: Ief894f1e36ddabdcfb9efe851ade4332ffcd9bac
2021-10-05 23:20:27 +00:00
Treehugger Robot
407c8c4fc5 Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846 am: 3b449c249f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: Ibbd974649418e4cc97668992be4af09026ff88d6
2021-10-05 18:49:07 +00:00
Treehugger Robot
3b449c249f Merge "Fixing a build breakage caused by an incorrect link. Version code for Android T doesn't exist yet, removing the link." am: 6a0afe1846
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845234

Change-Id: I8249e3a7426ee9f3d2d22ba6ae093d217980acc2
2021-10-05 18:36:56 +00:00
TreeHugger Robot
f81f06da29 Merge "Use AttributionSource Builder" into stage-aosp-master am: d34ebacb36
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889347

Change-Id: I4406ed3171a05afc52155faeb226fe4b66da2735
2021-10-05 17:32:24 +00:00
TreeHugger Robot
d34ebacb36 Merge "Use AttributionSource Builder" into stage-aosp-master 2021-10-05 17:17:13 +00:00
Jacob Hobbie
183e274d57 Fixing a build breakage caused by an incorrect link. Version code for
Android T doesn't exist yet, removing the link.

Test: presubmit, comments only, should just be "is build fixed"
Bug: 202151792
Change-Id: I2123f804aaed39eb7d31f25058c59a3c1df4d7d1
2021-10-05 09:11:39 -07:00
Alex Johnston
fc56413956 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce am: 82b82e3a73 am: 60be94ef59
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I35c83a5cc36ea49d4c39f384a4e76c5da6bdb0ab
2021-10-05 15:55:22 +00:00
Alex Johnston
60be94ef59 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce am: 82b82e3a73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I042c8fbba177a506068183be34fe8a3d053ada99
2021-10-05 15:54:53 +00:00
Alex Johnston
82b82e3a73 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I3d56b09b853516237428e695a21ab263722952bd
2021-10-05 15:23:58 +00:00
Alex Johnston
c8c3e89dce Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I90e8a4d567fe2de9ab765806fc7bd3aba4fe0845
2021-10-05 15:11:32 +00:00
Alex Johnston
4e8851d0d8 Revert "Revert "Cherrypicking flags and override methods for all..."
Revert "Revert "Required change for adding overload method for r..."

Revert submission 1842720-revert-1836473-receiverChangesinAOSP-FWJQDTADTI

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/202144225
Reverted Changes:
I03409ea39:Revert "Required change for adding overload method...
I583a11d2a:Revert "Cherrypicking flags and override methods f...

Change-Id: I5cdf9c74d51a259fdaa43dfdc9423d22145eac60
2021-10-05 14:57:10 +00:00
Jacky Kao
d393be2b1a Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9 am: 9403386966 am: c3404a20aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: I726d14661ab9ae6907b36d136c70c44608801550
2021-10-05 13:19:58 +00:00