PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,388 Commits 1 Branch 0 Tags
79b2186d23e66b41f5acc9436785b38c96b458d5
Commit Graph

74388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanley Wang
4ff2999126 Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: ca05c7fabd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I0b35dde4ac0443eaeefaa5083eeafbc0e3e1a149
 2020-06-30 10:53:47 +00:00
Stanley Wang
ca05c7fabd Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I132e88d5b1cb22db5042c0e66b6bc61ab30efcba
 2020-06-30 10:41:41 +00:00
Stanley Wang
e9a33d48fb Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I032839c91c8951bec8014554b7cb7de5d73d0132
 2020-06-30 10:41:39 +00:00
Stanley Wang
e86dd271da Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev 2020-06-30 10:28:33 +00:00
Stanley Wang
db0687c447 Remove the prefix "Model:" from the summary of hardware. 
Fixes: 159529327
Test: run robotest and observe the UI
Change-Id: I60f4a341b427e4b619a202a440f3f2554c562a27
 2020-06-30 16:45:47 +08:00
Arc Wang
5a298fbde0 Fix AlertActivity child objects dark theme problem 
In Settings, AlertActivity child objects use the theme
which is not compatible with dark theme.
Use @*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight
to fix dark theme problem.

Bug: 157961813
Test: manual visual
Change-Id: I49decbd51a4346c65c9b40dbe056687337b4b385
 2020-06-30 14:16:12 +08:00
Joshua Duong
e769d47825 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 3de3fa1f78 am: a75d3776d9 am: a5d11ba79b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I1d3b975dd23af094770161b58898818442986afe
 2020-06-30 02:44:30 +00:00
Joshua Duong
febb2fac2a Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: ba1e9c30c4 am: ac7e62af8d am: 797a0ccb3c am: 1f479e88f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I956c7ec0fa17242d24f4743f8bd426032264b32c
 2020-06-30 02:44:21 +00:00
Joshua Duong
1c4c478c27 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 8917715fca am: c4e8b3822b am: c811213dde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I1b058688ff9ea3f2d1b06acef1c4aada33d43a8b
 2020-06-30 02:44:09 +00:00
Joshua Duong
a5d11ba79b Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 3de3fa1f78 am: a75d3776d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Ib195752bff13c1bfeb819c638dfa4af744c81daa
 2020-06-30 02:31:10 +00:00
Joshua Duong
1f479e88f3 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: ba1e9c30c4 am: ac7e62af8d am: 797a0ccb3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I553fbfa303bf0a2e32f26291245ba31d10d54231
 2020-06-30 02:31:02 +00:00
Joshua Duong
c811213dde Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 8917715fca am: c4e8b3822b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I60a80788887e25d1296bffd3aff200763b6c8678
 2020-06-30 02:30:37 +00:00
Joshua Duong
a75d3776d9 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 3de3fa1f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I3ba32c3a9ffa30be8456a2f4690a15af7726b314
 2020-06-30 02:18:37 +00:00
Joshua Duong
797a0ccb3c Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: ba1e9c30c4 am: ac7e62af8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I0d4d420daa588a2179038c9d1bece939226ccb82
 2020-06-30 02:18:12 +00:00
Joshua Duong
c4e8b3822b Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 8917715fca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I2f1bdd4b0bf84c11349da6f234ffca9ae9874b70
 2020-06-30 02:18:01 +00:00
Joshua Duong
ac7e62af8d Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: ba1e9c30c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Id96ff4092b01f68de14c859461e2cf82717694c8
 2020-06-30 02:08:09 +00:00
Joshua Duong
3de3fa1f78 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I0e614ceae85cc87efc4e26a4d8a277b52b582fb6
 2020-06-30 02:07:54 +00:00
Joshua Duong
8917715fca Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I8f07e53a674a9494a7148dcee9e9bf45db097330
 2020-06-30 02:07:53 +00:00
Joshua Duong
ba1e9c30c4 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Id03f133b8480af4f1febe9cbf7b9024896ba67b1
 2020-06-30 01:52:18 +00:00
Joshua Duong
d6b68cb328 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Ic5de5436b1386028a26f121d8d857d27e7aebece
 2020-06-30 01:51:47 +00:00
Joshua Duong
8776749e88 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev 2020-06-30 01:41:14 +00:00
Kevin Chyn
351558fa0d Merge "Update Settings together with generateChallenge/revokeChallenge" am: 74ed9014a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11995819

Change-Id: I1c24145cc063f4aa84916418c8f1071e838d563f
 2020-06-30 00:58:50 +00:00
Kevin Chyn
74ed9014a8 Merge "Update Settings together with generateChallenge/revokeChallenge" 2020-06-30 00:41:05 +00:00
Lucas Dupin
0f3983c713 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: 88a47d6bda am: 2fd9c7af96 am: 7f12f229c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I5a5553eca9159959b2de9b61a4c78399a5eeba3e
 2020-06-29 20:27:44 +00:00
Lucas Dupin
d9fd7c4e1f Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: d5fcde5f09 am: f96f125b61 am: fa6af0c5d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I12fdeff28c8400708c814e9d6cb4d74702f5f30f
 2020-06-29 20:13:16 +00:00
Lucas Dupin
4a7b4e9283 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 1530c46690 am: e030668d6b am: 786a6dec8d am: 5b08b63c1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I7064ebbf0321ca140810ae8a48261d0dde0014ba
 2020-06-29 20:13:02 +00:00
Lucas Dupin
7f12f229c7 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: 88a47d6bda am: 2fd9c7af96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I677bb4c975d93bea2042d817fbfe6e7ba4c17610
 2020-06-29 19:34:17 +00:00
Lucas Dupin
fa6af0c5d9 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: d5fcde5f09 am: f96f125b61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: Iba7d98bfce2d8454cfe0b69b67937ffa15ae44cc
 2020-06-29 19:34:08 +00:00
Lucas Dupin
5b08b63c1d Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 1530c46690 am: e030668d6b am: 786a6dec8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I3569252bdad698d8c07727da56779e0fb83a5bb4
 2020-06-29 19:33:33 +00:00
Lucas Dupin
2fd9c7af96 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: 88a47d6bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I45a83fbbeb3cbaedf69a5c7d6f4d67885ad58524
 2020-06-29 19:15:24 +00:00
Lucas Dupin
f96f125b61 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 am: d5fcde5f09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I30c7cf15a5fc024539e87156dd410412c85ab7d9
 2020-06-29 19:15:01 +00:00
Lucas Dupin
786a6dec8d Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 1530c46690 am: e030668d6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: Ib094d6141f7d77f044be53a8cb80c2cd6334fc6a
 2020-06-29 19:14:46 +00:00
Lucas Dupin
88a47d6bda Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I30f94c505b59e5b0e865f451a63b466bb1412111
 2020-06-29 19:02:37 +00:00
Lucas Dupin
d5fcde5f09 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 51aacb7752 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I402237ce71cf2084085d1375380c4aada6d8aa1a
 2020-06-29 19:02:19 +00:00
Lucas Dupin
e030668d6b Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 am: 1530c46690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I21875f9bac17a782d238f7515d9e84b36db15144
 2020-06-29 19:01:03 +00:00
Lucas Dupin
1530c46690 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: Ie05cfa7cc0897e370c3ced865dceee0745b5533c
 2020-06-29 18:48:39 +00:00
Lucas Dupin
51aacb7752 Merge "Change the order of dark theme options to match night light" into rvc-dev am: 837bda1f25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006807

Change-Id: I369b03f9371b0b8063f9f63b94f83b9b18555f4a
 2020-06-29 18:48:17 +00:00
Lucas Dupin
837bda1f25 Merge "Change the order of dark theme options to match night light" into rvc-dev 2020-06-29 18:35:12 +00:00
Minche Li
45de9111fc Merge "Supports triple-tap shortcut for window magnification" am: 08e2fec40d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908538

Change-Id: I1519c6df733daf0ba3abc4027d375ded3b28b5b4
 2020-06-29 17:17:34 +00:00
Minche Li
08e2fec40d Merge "Supports triple-tap shortcut for window magnification" 2020-06-29 17:05:02 +00:00
Treehugger Robot
d4889a234f Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 am: c5278b7610 am: 49954a28b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Idae50b55487e8d50c3dd2428d94a05b20512b5e8
 2020-06-29 15:42:09 +00:00
Treehugger Robot
49954a28b7 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 am: c5278b7610 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I97b1e64a713fddd5325c716ee758c58ade66c593
 2020-06-29 15:27:58 +00:00
Treehugger Robot
c5278b7610 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Id472f21203bb4dfe3e460db74c68e1b523a52ab4
 2020-06-29 15:16:01 +00:00
Treehugger Robot
d1051792b1 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia665650c897801e914d9c580e4f2f59e9fe2ec28
 2020-06-29 15:01:17 +00:00
Treehugger Robot
3947998755 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
 2020-06-29 14:39:26 +00:00
Treehugger Robot
fce601ea2a Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia62597a163e529ef20e4136645709b0d300a4fc4
 2020-06-29 14:28:03 +00:00
Treehugger Robot
b1cea4f1bc Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" 2020-06-29 14:14:47 +00:00
LuK1337
ad243904db Settings: Fix fallback summary for power_button_instantly_locks preference 
* Using summary_placeholder instead of summary_empty
  leaves an ugly empty space.

Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
 2020-06-29 12:27:06 +02:00
TreeHugger Robot
a490eef6f9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: d22c1f1552 -s ours am: d49caa29b9 -s ours am: 2fd313701a -s ours am: 90d44a54e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia7a2ea9a37d832c328ba759ca676506b7a2bed62
 2020-06-29 09:32:32 +00:00
TreeHugger Robot
c4e834302a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f002dd72ac -s ours am: ee707c052b -s ours am: a7247b35ae -s ours am: ab5652e67f -s ours am: 909da0de5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63815e19298cd7e0383740d5f872aee229f02f6c
 2020-06-29 09:31:55 +00:00