PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,671 Commits 1 Branch 0 Tags
acba236677d6f600cb9e35e2461d67c765d5e9cd
Commit Graph

71671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Vela
acba236677 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04da28694d92bf00afee8eec26f6cf9dc63e13a4
 2020-12-14 22:25:47 +00:00
Diego Vela
9d61c8a23d Merge "Revert "Add <uses-library> information."" am: 54b741096b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib54a0349bf3590b40165d2205171e9c58a0a7b6f
 2020-12-14 21:59:32 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information." 
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
 2020-12-14 21:14:24 +00:00
Robert Luo
3107b30f49 [automerger skipped] Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev am: 4dd011b3c7 -s ours 
am skip reason: Change-Id I5abb471452ec92670d220b2472eadbe77e243653 with SHA-1 8da41d2eda is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13182886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae60c309ec6cf303dc5554f6c9d82fc7f6b088ac
 2020-12-11 07:13:10 +00:00
Robert Luo
4dd011b3c7 Merge "Migrate media output switcher metrics - 2/n" into rvc-qpr-dev 2020-12-11 06:56:24 +00:00
Robert Luo
a2e12619d5 Merge "Migrate media output switcher metrics - 3/n" into rvc-qpr-dev-plus-aosp 2020-12-11 02:15:47 +00:00
TreeHugger Robot
04e97d441d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e05f1a4bb7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13202479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie055bb147e9bb33ddd6508aa69147b95ec49d932
 2020-12-11 01:05:20 +00:00
TreeHugger Robot
e05f1a4bb7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-11 00:11:36 +00:00
Bill Yi
a26056a6ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ica5c216524bf124fc447dd64e2b7ca36c244fb81
 2020-12-10 12:10:19 -08:00
Ulyana Trafimovich
9ba309779b Merge "Add <uses-library> information." am: 4bb99a788a am: b10b31bcad 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d3304ca9208a84f1026c731e04a60298ed4efbd
 2020-12-10 11:15:04 +00:00
Ulyana Trafimovich
b10b31bcad Merge "Add <uses-library> information." am: 4bb99a788a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86e3713c8ba955f4c655d3ea25f7c07b248ce3d8
 2020-12-10 10:34:10 +00:00
Ulyana Trafimovich
4bb99a788a Merge "Add <uses-library> information." 2020-12-10 10:19:15 +00:00
tim peng
b36ec713ce Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1054e999a39a7a91ad9fa04f874b12370b8a89
 2020-12-10 05:53:28 +00:00
tim peng
656867b4de Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev 2020-12-10 05:30:42 +00:00
Xin Li
fb437d54d9 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours am: ee06524dbe -s ours 
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b33cb519a95d18ba7d64d90db3b10e3a9afe211
 2020-12-10 03:46:48 +00:00
Robert Luo
8da41d2eda Migrate media output switcher metrics - 3/n 
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.

Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
 2020-12-10 11:10:45 +08:00
Xin Li
ee06524dbe [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5 -s ours 
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2389a3b1ff505dc0a8cc84b1d9b21dd7f6c01b
 2020-12-10 03:05:02 +00:00
Xin Li
6e252c4cd5 Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:22 +00:00
TreeHugger Robot
317aa9e772 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372 am: 79bf00aac3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2a7d0a9ebb8f0840a18f6997bd512f720e35a71
 2020-12-09 14:50:28 +00:00
Jakub Pawlowski
e0dfc703da [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours am: 24c8adbd0d -s ours am: c488511160 -s ours am: ad9f74366f -s ours 
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic77851a94af2e13604dd1bc690efd7a005269a8a
 2020-12-09 14:49:00 +00:00
TreeHugger Robot
79bf00aac3 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 am: 0b89867372 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
 2020-12-09 14:31:38 +00:00
Jakub Pawlowski
ad9f74366f [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours am: 24c8adbd0d -s ours am: c488511160 -s ours 
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82517ee38de45ef7b2e2ea36d8efa3b6c7f106f6
 2020-12-09 14:31:28 +00:00
TreeHugger Robot
0b89867372 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f am: f49e9d2196 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
 2020-12-09 14:03:32 +00:00
Jakub Pawlowski
c488511160 [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours am: 24c8adbd0d -s ours 
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff5d3ed58db08fa24afb1deb482ac2e12e9f3a0f
 2020-12-09 14:03:14 +00:00
TreeHugger Robot
f49e9d2196 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd am: 635029b87f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
 2020-12-09 13:49:10 +00:00
Jakub Pawlowski
24c8adbd0d [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours am: d35af468b7 -s ours 
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e6c8911bbb7a22386468a0d077826151f7faceb
 2020-12-09 13:48:57 +00:00
TreeHugger Robot
635029b87f Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 am: cfdae774cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
 2020-12-09 13:03:53 +00:00
Jakub Pawlowski
d35af468b7 [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours am: b15b6450fa -s ours 
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I245a20b64373500c886a47d18da39500fd248c0f
 2020-12-09 13:03:47 +00:00
TreeHugger Robot
cfdae774cd Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c am: 2117006bc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
 2020-12-09 12:17:08 +00:00
Jakub Pawlowski
b15b6450fa [automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 am: c721dc5bad -s ours 
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26950e18ca79bb70e0a91492997242934ec19641
 2020-12-09 12:16:57 +00:00
TreeHugger Robot
2117006bc6 Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
 2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c Merge "Add bluetooth package to permission request intent" into oc-mr1-dev 2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
 2020-12-09 11:32:56 +00:00
Jakub Pawlowski
b29c036522 Prevent overlay drawing on top of Bluetooth activity dialog 
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
 2020-12-09 08:00:22 +00:00
Xin Li
540fd7333f DO NOT MERGE - Merge Android R QPR1 
Bug: 172690556
Merged-In: Id2d9c4f56beae280e6299b6695185577a1521345
Change-Id: Ice3069b89e1a47121d1920aa3e45fbddbed5678e
 2020-12-08 23:49:38 -08:00
Robert Luo
2b6fd92de9 Migrate media output switcher metrics - 2/n 
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.

Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
 2020-12-09 15:42:56 +08:00
TreeHugger Robot
3a150908c3 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6 am: f7f1781146 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7414cd5ed7a804b1cf6a31dc57d6c0197219b386
 2020-12-09 00:55:13 +00:00
TreeHugger Robot
f7f1781146 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 am: db48b810b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42ad211ac7f3341c38d7b7f992b19e3ae52c9373
 2020-12-09 00:32:11 +00:00
TreeHugger Robot
db48b810b6 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
 2020-12-09 00:16:09 +00:00
TreeHugger Robot
4c4f83eb21 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
 2020-12-08 23:58:02 +00:00
TreeHugger Robot
537c730ca2 Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
 2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev 2020-12-08 22:56:46 +00:00
Ulya Trafimovich
202ca49dfe Add <uses-library> information. 
The required <uses-library> "org.apache.http.legacy" is in the manifest
for Settings. It is necessary to explicitly add it to `uses_libs`
because it is not among the app dependencies (so Soong does not add it
automatically to the manifest_fixer). It also doesn't add it as a
compatibility library because the target API level for the app is not
below 28.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml
Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm
Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02
 2020-12-08 12:09:53 +00:00
tim peng
c93b70e3a0 Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
 2020-12-08 06:28:52 +00:00
timhypeng
3273b4ebb4 Update rule of launching media output dialog am: 6472c98ffa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaeec1436e45b25fce4a4ef08155d35b8b047d916
 2020-12-08 06:28:50 +00:00
timhypeng
c26d9f3d48 Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0fc610e5b5f17f9788fc12b96d2871c20be9725
 2020-12-08 06:28:49 +00:00
timhypeng
3254d59f0f Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bce385da81472db27ebe07634e0ad9f0507e47f
 2020-12-08 06:28:46 +00:00
tim peng
3cea72fb2b Merge changes from topic "media_output_dialog" into rvc-qpr-dev 
* changes:
  Redirect to output switcher panel to the new dialog
  Update rule of launching media output dialog
  Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
  Add PairNewBluetoothReceiver to launch Bluetooth pairing page
 2020-12-08 05:46:13 +00:00
tim peng
32ef316678 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4c0ebb50dd2caaeabb1f39549a80d1de0890201
 2020-12-08 01:09:56 +00:00