PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,899 Commits 1 Branch 0 Tags
51c66e24f3ea810b50ba3a8833f3cd6b2d969efc
Commit Graph

90899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a3102c477f Merge "Fix dream settings OWNERS path" am: c6bf492db4 am: 58fb784e7d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: I99530d86b8e1372034bf3f1edaf65c7c809dbb15
 2022-02-15 00:55:50 +00:00
Treehugger Robot
58fb784e7d Merge "Fix dream settings OWNERS path" am: c6bf492db4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: Ifeb24520760d02cefc9ab12ff648203dbd2a988b
 2022-02-15 00:42:12 +00:00
Treehugger Robot
c6bf492db4 Merge "Fix dream settings OWNERS path" 2022-02-15 00:22:02 +00:00
Xin Li
7928abd2b2 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: da7237b2ed -s ours 
am skip reason: Merged-In I962c318f41adcf180b885f2052ce0ec4952edfb6 with SHA-1 0eab9c02b9 is already in history

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

Change-Id: I489e0cbc88a0095b34f3b3c260b4a908c764bf55
 2022-02-14 18:03:30 +00:00
Xin Li
da7237b2ed Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:11 +00:00
Lucas Silva
55ce0f7cdd Fix dream settings OWNERS path 
Change-Id: I4ebcec52d96cee03448a872984036c314c760eaa
 2022-02-14 17:02:16 +00:00
Treehugger Robot
b7077ab55f Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c am: 1a16975a36 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698

Change-Id: I0196d39d1e8d619a54931492fc89f15b8b5dfc99
 2022-02-14 11:49:04 +00:00
Treehugger Robot
1a16975a36 Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698

Change-Id: Icecb9f0232a86fbbaf8f8d9a22c86aaa40ab234d
 2022-02-14 11:27:00 +00:00
Treehugger Robot
57238d653c Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" 2022-02-14 10:50:17 +00:00
Treehugger Robot
a93434b11e Merge changes Idadf8487,I84d87024 am: e489d46b7c am: 43b7ae19fb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855

Change-Id: I38ae0b28716a446c9d30a3fbcf7517d0c74e3d30
 2022-02-12 12:35:48 +00:00
William Escande
fe155f50fc Use allowed system value am: 088a7b87f2 am: f859d0f15d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854

Change-Id: If7fd42b0a7c006635073a3704ec0af1ac68ada55
 2022-02-12 12:35:43 +00:00
Treehugger Robot
43b7ae19fb Merge changes Idadf8487,I84d87024 am: e489d46b7c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855

Change-Id: I4ee8583862f590206240d107d9a2a509edea03df
 2022-02-12 12:21:09 +00:00
William Escande
f859d0f15d Use allowed system value am: 088a7b87f2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854

Change-Id: I757da4bdfd98e460ae66ff1c31d74e2838480a8a
 2022-02-12 12:21:08 +00:00
Treehugger Robot
e489d46b7c Merge changes Idadf8487,I84d87024 
* changes:
  Resolve bluetooth hidden API usages
  Use allowed system value
 2022-02-12 12:06:16 +00:00
William Escande
6de80163b1 Resolve bluetooth hidden API usages 
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
Merged-In: Idadf84873c88155382c48bb9108cf28d88aaef0a
 2022-02-11 14:19:38 +01:00
William Escande
088a7b87f2 Use allowed system value 
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
Merged-In: I84d87024423869515937ab87381be572fed0ba65
 2022-02-11 13:05:33 +01:00
Xin Li
b9e9ca119c Merge sc-v2-dev-plus-aosp-without-vendor@8084891 
Bug: 214455710
Merged-In: I962c318f41adcf180b885f2052ce0ec4952edfb6
Change-Id: I77764eaf895ac3c13c7440adb5b3f597a516d690
 2022-02-11 07:29:32 +00:00
Tsung-Mao Fang
e098415564 Merge "Update OWNERS for dream settings" am: e294a5a1db am: 144f23be39 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I3da1488d455189eb25107e5452040fa86e8d2ae4
 2022-02-11 06:47:00 +00:00
Tsung-Mao Fang
144f23be39 Merge "Update OWNERS for dream settings" am: e294a5a1db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I0eee5bb9c89621f84bc43bc9e8763991b782c292
 2022-02-11 06:25:15 +00:00
Tsung-Mao Fang
e294a5a1db Merge "Update OWNERS for dream settings" 2022-02-11 06:12:16 +00:00
Lucas Silva
c3f78bce8d Update OWNERS for dream settings 
Change-Id: Ie4b483907918986c3b1b4b284ec0f977569cfd58
 2022-02-10 19:40:25 +00:00
Julia Reynolds
445aa53ddc Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c am: 809c15fd53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: I4f8ce83fea5cde2ddf4517c78e5f66bae461a1ea
 2022-02-10 14:38:05 +00:00
Julia Reynolds
809c15fd53 Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: Id88fd287953b4190d4830d0037d9f0817e6a715b
 2022-02-10 14:22:43 +00:00
Julia Reynolds
e2d790725c Merge "Update notification settings OWNERS" am: 49b9583ea1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: I3bdeaab21beed6c214d28516b9699a20c5b09dd5
 2022-02-10 14:04:25 +00:00
Julia Reynolds
49b9583ea1 Merge "Update notification settings OWNERS" 2022-02-10 13:48:25 +00:00
Tom Hsu
d1040f8fe9 Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 am: f9355dcc95 am: 3639f8c59a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I4db5ebcc51cef0ad63ce03b0d3d137515c6fa8a5
 2022-02-10 10:32:35 +00:00
Tom Hsu
3639f8c59a Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 am: f9355dcc95 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I137701d26151296a0ef8e7401a1cfc3334952230
 2022-02-10 10:06:56 +00:00
Tom Hsu
f9355dcc95 Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I35dceb538404edcbe552b87c6c615c0c8d16c69b
 2022-02-10 09:52:36 +00:00
Tom Hsu
38cb70ffd9 Merge "Add a OWNER file for per-app language" 2022-02-10 09:31:50 +00:00
tom hsu
085e5fc946 Add a OWNER file for per-app language 
Change-Id: I5b0d9491db1f1ba602306289d6df2e4282c2bece
 2022-02-10 15:27:09 +08:00
Jack Yu
c7b568751e Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT 
Use Intent.EXTRA_USER to pass the UserHandle as the extra field of
ACTION_CHANGE_DEFAULT.

Bug: 215300017
Test: manual
Change-Id: I8862ae509638c7c264f49c4bc5753a65e8fdcfbc
 2022-02-09 21:34:59 +08:00
Junyu Lai
1dd7274517 Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 am: 35dea12973 am: 8576384cfb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: If5ca64b8748d28e118c100928bc23502ff86bbaa
 2022-02-09 10:24:11 +00:00
Junyu Lai
8576384cfb Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 am: 35dea12973 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: Ide3b3b54b00ece1d374d83327b14ad7609c8e133
 2022-02-09 10:12:25 +00:00
Junyu Lai
35dea12973 Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626

Change-Id: Iad8e74e3158f1775372cdc3ba6bd1414952c79be
 2022-02-09 09:55:37 +00:00
Junyu Lai
e299e37585 Merge "Remove dependencies on hidden network stats APIs" 2022-02-09 09:30:37 +00:00
Tsung-Mao Fang
1f813519e6 Merge "Owners updates" am: af7fc198fb am: 1e680abc54 am: 2295828423 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: Idbc20317b6e4323e2cd76f07e5bf8877c5c7af1f
 2022-02-09 07:08:29 +00:00
Tsung-Mao Fang
2295828423 Merge "Owners updates" am: af7fc198fb am: 1e680abc54 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: Id8a05278d9d6b0ca318f8a4d53c55a38d56c5f38
 2022-02-09 06:57:42 +00:00
Tsung-Mao Fang
1e680abc54 Merge "Owners updates" am: af7fc198fb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1962927

Change-Id: I55a50aa88fe57fe70c81e625668cfdb47d6cb476
 2022-02-09 06:38:50 +00:00
Tsung-Mao Fang
af7fc198fb Merge "Owners updates" 2022-02-09 06:22:48 +00:00
Treehugger Robot
9464f1e4ac [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours am: ae65af5986 -s ours am: 8cce36a71c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I978c29531cb76675bb02723a24c19cc787c94c07
 2022-02-08 21:28:44 +00:00
Treehugger Robot
8cce36a71c [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours am: ae65af5986 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb8bb0a0777af47ebdaec20884a3022e23921166
 2022-02-08 21:12:18 +00:00
Treehugger Robot
ae65af5986 [automerger skipped] Merge "DO NOT MERGE Fix of crash when error messages are triggered" am: 46fc8079dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b38a7fa23d1cdd1af6646b09c990c53fce397b5
 2022-02-08 21:01:36 +00:00
Treehugger Robot
46fc8079dd Merge "DO NOT MERGE Fix of crash when error messages are triggered" 2022-02-08 20:39:45 +00:00
Treehugger Robot
5e1dfee6ff [automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9ae am: 428e9e636e -s ours am: b37895268a -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I13fa5da1028bb250308137d020406178092c0182
 2022-02-08 20:15:28 +00:00
Treehugger Robot
b37895268a [automerger skipped] Merge "Merge SQ1A.220205.002" am: c45b4ab9ae am: 428e9e636e -s ours 
am skip reason: Merged-In Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 with SHA-1 fca5cb3748 is already in history

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

Change-Id: I406df0fb04ab8e070c78dd8b4c6ed6634b5a3b84
 2022-02-08 19:44:40 +00:00
Treehugger Robot
428e9e636e Merge "Merge SQ1A.220205.002" am: c45b4ab9ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976020

Change-Id: I38d97dff8fcb284120608d2bbfb369a7374a4398
 2022-02-08 19:12:24 +00:00
Treehugger Robot
c45b4ab9ae Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:08 +00:00
Chienyuan
84a9b23ba8 Show identity address in the bluetooth details page 
Bug: 197044261
Test: build pass
Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b
 2022-02-08 11:29:03 +00:00
Remi NGUYEN VAN
74cf5865cf Remove dependencies on hidden network stats APIs 
Replace usage with equivalent stable APIs.

Bug: 197717846
Test: atest SettingsRoboTests
  (cherry-picked from ag/16779860)
Change-Id: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
Merged-In: I4151b831fc83dee9b36292cd7991f9b294ed4ff2
 2022-02-08 19:06:02 +08:00
Treehugger Robot
df5a05a704 [automerger skipped] Merge "Settings: Fix FC when learn more textview help intent is NULL" am: 17e8159641 am: 6040d46cb0 am: 3210089fc6 -s ours 
am skip reason: Merged-In I4e7a7c926205be1179d55d33ada345024c8a44ab with SHA-1 8f0291cd1a is already in history

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

Change-Id: If4a72056e659579e6ed6928df26a7cf5f6155b43
 2022-02-08 10:33:06 +00:00