PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,360 Commits 1 Branch 0 Tags
8b50a415767e1afe26ac3934d98d0b0e6525482d
Commit Graph

102360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
8b50a41576 [automerge] Fix "Factory Reset" fails to reset the device 2p: f8739eda93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684397

Change-Id: I614552d70356794daa34623d26924c0a65f91430
 2022-04-11 13:58:18 +00:00
Edgar Wang
f8739eda93 Fix "Factory Reset" fails to reset the device 
when device didn't support PersistentDataBlockManager, Settings will
crash at get PersistentDataBlock service.
So we need to check if device support PersistentDataBlockManager
before call getService.

Fixes: 196634851
Test: manual verify on aosp build.
Change-Id: I5afba5df8c4831499478490b442c0fcf367d23ae
 2022-04-11 21:50:01 +08:00
Presubmit Automerger Backend
81fe82cadd [automerge] [LE Audio] Broadcast Sink UI 2p: a56e198c61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17442209

Bug: 228274114
Change-Id: I327f34d0ffc5270d0869e20a4345d5f95adf42ec
 2022-04-11 08:18:56 +00:00
changbetty
a56e198c61 [LE Audio] Broadcast Sink UI 
- Add dialog for Broadcast and find broadcast source

 - Add Activity for find broadcast source

Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
 2022-04-11 08:15:10 +00:00
TreeHugger Robot
69985d41a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e30961b85c4152b0e47c4c500d647126442540e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:32:53 +00:00
Bill Yi
4c909c1c25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I312f44cb6a995b6a75f48d065442291d4de9d31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:32:51 +00:00
TreeHugger Robot
18bdecad94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8793bb8cecefada63074542b428549ca222330b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:17:13 +00:00
Bill Yi
3d34896214 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97e9045aa6b5e9c5928968f3998e57d458ef1942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 07:17:11 +00:00
TreeHugger Robot
bfca67681e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie33e413e9996f20f74d5d769daa4145add0e170b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:46:27 +00:00
TreeHugger Robot
f6bc991eca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcf3abb8947dddfdf7db01c7ed7a7a8fb8b95042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:45:50 +00:00
Bill Yi
772b675c21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2141797b3768ad979ff4dd600687ec17e4b28a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:45:41 +00:00
TreeHugger Robot
0aa436da2b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:41:44 +00:00
TreeHugger Robot
bb4a1919dc Merge changes from topic "presubmit-am-7e0f8decf1534e95a25450c07aba46b6" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f0622598ef
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 06:41:44 +00:00
TreeHugger Robot
1ff9008a15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours am: f8cae93b6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I049b8a9831c94ab27134536fbc5f4de5cb49c6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:32:35 +00:00
TreeHugger Robot
f8cae93b6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81954c4e9a931190a8b683014396ddf5da8b35b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:31:57 +00:00
TreeHugger Robot
b2b1ef2d56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: abd1a29b60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I205896342a63f7bda4501c1837f770554c785a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:31:17 +00:00
TreeHugger Robot
abd1a29b60 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:26:16 +00:00
TreeHugger Robot
b65239609f Merge changes from topic "presubmit-am-50abc0852b4146d4bad97ce28a86b353" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 29510c162d
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 06:26:16 +00:00
TreeHugger Robot
6a8dbf49bd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 06:23:57 +00:00
TreeHugger Robot
8a8aebe5ad Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev am: 652b9f46bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004

Change-Id: I97a7ea13ec2b9bf41b04efc845467121f866c168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:23:19 +00:00
Bill Yi
6c3aae41fb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 am: 7df6d79353 -s ours am: 80f9c4f88d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I864f0d54249c1500be11559ce03e4d407adde450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 06:23:12 +00:00
TreeHugger Robot
cb8148ebaf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-11 06:05:47 +00:00
TreeHugger Robot
652b9f46bc Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 06:05:47 +00:00
TreeHugger Robot
69c324e056 Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 2p: 7f2b0a3e06
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 06:05:46 +00:00
Bill Yi
80f9c4f88d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 am: 7df6d79353 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I886e3694aeb948d9f851335978c429dc62e2620c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:59:26 +00:00
Bill Yi
51e81c46f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8acb20ea2a -s ours am: de1870ffed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1fa762392f5979d61494a6d682dfcadb1f935e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:01:33 +00:00
Bill Yi
de1870ffed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8acb20ea2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37b8fab4a16c5e5f94266bd46f41f7a814bdfe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 04:47:20 +00:00
TreeHugger Robot
637b43463e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-11 04:33:59 +00:00
Bill Yi
f89aa3ca1a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21a2962c5ae08b820a33b14a9a2c0243776cf792
 2022-04-09 13:30:52 +00:00
Bill Yi
7df6d79353 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ied5fd9d22e8a7567f921d24c344a6419ccf1fbbe
 2022-04-09 13:15:09 +00:00
Bill Yi
a8dc008745 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic7c984e8829ae72309c1fc673d8b5efda52cac25
 2022-04-09 13:15:01 +00:00
Bill Yi
8acb20ea2a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8ec8d124d01075b528fe637783670daccb2da3cf
 2022-04-09 13:07:19 +00:00
Bill Yi
9b0be6027a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 2p: 7f2b0a3e06 
Blank merge reason: parent was merged -s ours

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

Change-Id: Ieb3279c6f3d6979a8dc1c0562e2cfdbe7415b65e
 2022-04-09 13:04:04 +00:00
Bill Yi
7f2b0a3e06 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 
Blank merge reason: commit message contains skip directive

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

Change-Id: I9121da491000a804d91723b6e13ee9d2a74f82c2
 2022-04-09 13:03:55 +00:00
Bill Yi
4beecb6946 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia56e96f0f7b667a6811440e12e3caab7dee7548e
 2022-04-09 13:03:44 +00:00
TreeHugger Robot
3e5d901bc6 Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev am: 3ed73b7b2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Change-Id: Ibb59d5affa1863e748b7fe717844c09223f48063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 09:21:02 +00:00
TreeHugger Robot
3ed73b7b2d Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev 2022-04-09 08:59:05 +00:00
TreeHugger Robot
67b061ae0b Merge changes from topic "presubmit-am-c49a96c26d054adbb0d2e7c248dd53a1" into tm-mainline-prod 
* changes:
  [automerge] Fix unexpected Wi-Fi hotspot shutdown 2p: 6c42636cb8
  Fix unexpected Wi-Fi hotspot shutdown
 2022-04-09 08:59:04 +00:00
Bill Yi
b91890917c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 29510c162d 
Blank merge reason: commit message contains skip directive

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

Change-Id: I2cf5c160f2157dad99ed29ff44cef3c01f61b6d2
 2022-04-09 04:38:13 +00:00
Bill Yi
29510c162d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib43c040ea78198a02e3a405c9d3814af1927458f
 2022-04-09 04:37:46 +00:00
Bill Yi
e8c63642aa [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f0622598ef 
Blank merge reason: commit message contains skip directive

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

Change-Id: If4f8b77ab5790aa97ebcd8f484da1e2e79e9f830
 2022-04-09 04:34:49 +00:00
Bill Yi
f0622598ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3cc4c934e8fe86a45c45dc1d62aab78a30585529
 2022-04-09 04:34:41 +00:00
Bill Yi
08f65d8f42 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I70e63ad6cf99b439c1815770da8cd2e7a266889b
 2022-04-09 04:33:02 +00:00
Bill Yi
582a27ce82 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I199b09573525dc0bf7b90a78536eff65417b374e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:56:57 +00:00
Bill Yi
5f2e624999 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5fd0d2114a135d8a789f2ccd2f8cf6325056ebb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:56:36 +00:00
Bill Yi
ee03d0172d [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8f47508a38cd60aba21309f166970901d42a13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:47:10 +00:00
Bill Yi
4dd803da1d [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84b054daea4ece17be364b6a405650ed9d3af04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:46:27 +00:00
Bill Yi
74fc91b313 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I8ccdc0914ae332731dbc24330bb7d42b05356ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:45 +00:00
Bill Yi
fdcf2eed39 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours 
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I24893b4908756aceef98fd3edf3ed0d68e5c27ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:30 +00:00
Lucas Silva
336f4991af Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: Ibeb86a0c80fb46afccc2f07b681251efacc62e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:13:54 +00:00