PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,254 Commits 1 Branch 0 Tags
eb27aefa325ac4b254d618d0005d0657bf86b2fc
Commit Graph

59254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vince Leung
eb27aefa32 Use super method for Vibration preferences 
onDisplayPreferenceDialog is overriden to handle BT related preferences
but VibrationPreferences require the super method of
onDisplayPreferenceDialog. Therefore if VibrationPreferences wants to
display a dialog, use the super method instead of the overriden method.

Bug: 150661723
Change-Id: I3f8e86e1d1f32fa6eae2798d3bad3cb48402db7b
 2020-03-10 14:00:02 -07:00
Automerger Merge Worker
149508de8c Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: f0256943f0 am: b4fd23207c 
Change-Id: Ie1a7cb8ad5082ecaf9106a871714db64f47b0e72
 2020-02-25 08:20:19 +00:00
Automerger Merge Worker
c2362e7068 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: 622e966881 am: 6a0d69c9b6 am: f53a5b71c3 
Change-Id: I069cd8cea3d26cb3842183811663287b25215c2c
 2020-02-25 08:20:10 +00:00
Automerger Merge Worker
c57bd18269 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: 7991e1fe7a am: f5b2f92b22 
Change-Id: I1c352890213d15e6f8a48e891839034d372e037a
 2020-02-25 08:19:58 +00:00
Automerger Merge Worker
b4fd23207c Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: f0256943f0 
Change-Id: I21e0459d8c9ad94c777b2e7251913fa044cf8ec5
 2020-02-25 08:07:16 +00:00
Automerger Merge Worker
f53a5b71c3 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: 622e966881 am: 6a0d69c9b6 
Change-Id: Ia9e3862aeccc81bdcf3fb9960a6f670a5a563773
 2020-02-25 08:07:08 +00:00
Automerger Merge Worker
f5b2f92b22 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 am: 7991e1fe7a 
Change-Id: I16be37023bdafc73af59b044118b51ea38c72958
 2020-02-25 08:07:01 +00:00
Automerger Merge Worker
f0256943f0 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 
Change-Id: I272b679a7d6eeb0d571f7f052884c1a8725f8f56
 2020-02-25 07:59:44 +00:00
Automerger Merge Worker
6a0d69c9b6 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: 622e966881 
Change-Id: I444bba0f7568d6d488b8559a37b6ec9f30d2d697
 2020-02-25 07:59:42 +00:00
Automerger Merge Worker
7991e1fe7a Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b am: aa0e7e8d37 
Change-Id: Ib8cb42e69124e79c455a78efae655f99be3921c5
 2020-02-25 07:59:29 +00:00
Automerger Merge Worker
622e966881 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b 
Change-Id: I38485ff2569e2c3e679676c490c25ddb25d86145
 2020-02-25 07:48:31 +00:00
Automerger Merge Worker
aa0e7e8d37 Merge "Added slot index in area info broadcast" into rvc-dev am: 490eba353b 
Change-Id: I491a6b9fda42d5173040000bb286c448d830aad2
 2020-02-25 07:48:12 +00:00
Jack Yu
490eba353b Merge "Added slot index in area info broadcast" into rvc-dev 2020-02-25 07:41:37 +00:00
Automerger Merge Worker
0577514d0d Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd am: 7300bab2b6 
Change-Id: If80a964d28950288f042d4a1ccfc183b9c4f0067
 2020-02-24 22:15:49 +00:00
Automerger Merge Worker
7300bab2b6 Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a am: e6c57426cd 
Change-Id: I9b1343aa6bd45384bd0a297b7c595af4ea2f6d18
 2020-02-24 21:58:13 +00:00
Automerger Merge Worker
e6c57426cd Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a am: 2d84cdbc3a 
Change-Id: I1dc710279b2a6fbfeac34951121ed9d7c3a4ee0a
 2020-02-24 21:48:28 +00:00
Automerger Merge Worker
2d84cdbc3a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a 
Change-Id: Idc2d504f99fdea780fcda81a221e2f57bc242e82
 2020-02-24 21:36:32 +00:00
Automerger Merge Worker
840506e88a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
 2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7 Merge "Catch crash in mobile network ProgressDialog" 2020-02-24 21:07:17 +00:00
Jack Yu
5a4dabcba2 Added slot index in area info broadcast 
Added slot index information in the broadcast
so the receiver knows which slot to get information.

Test: Manual
Change-Id: Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7
Fix: 150126754
 2020-02-24 11:54:34 -08:00
Automerger Merge Worker
6b8821e61f Merge "[automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: e987aeecde -s ours am: 50bd5698ef -s ours am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history" into rvc-qpr-dev-plus-aosp am: 5b888d1d02 -s ours 
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history

Change-Id: Ief6bff9b158984db6a9975f7c00b363d9e292f8b
 2020-02-24 18:12:04 +00:00
Automerger Merge Worker
1770ed4d3c [automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91 am: 51816dea20 -s ours am: 4a7035b11e -s ours 
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history

Change-Id: Ie29ab9d46027a0253fa615a6b60d853f41547bdb
 2020-02-24 18:11:57 +00:00
Automerger Merge Worker
84c53d3b50 [automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91 am: f6ae9a4864 am: a02d9031fa -s ours 
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 b9bcbddc46 is in history

Change-Id: I9a67c2ecb3ccfae620307bc1147cdc6f17c5427a
 2020-02-24 18:11:45 +00:00
Automerger Merge Worker
5b888d1d02 Merge "[automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: e987aeecde -s ours am: 50bd5698ef -s ours am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history" into rvc-qpr-dev-plus-aosp 2020-02-24 18:00:36 +00:00
Automerger Merge Worker
6d87c380ca [automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: e987aeecde -s ours am: 50bd5698ef -s ours 
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history

Change-Id: Iba89d747fbf37f1b208defd0c290b834cba630fd
 2020-02-24 18:00:33 +00:00
Automerger Merge Worker
4a7035b11e [automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91 am: 51816dea20 -s ours 
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history

Change-Id: I2b32a23dc6aec399c48010aa28e087d690f07503
 2020-02-24 18:00:32 +00:00
Automerger Merge Worker
a02d9031fa Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91 am: f6ae9a4864 
Change-Id: I189e511adebdd989015675fc729b531255dc271d
 2020-02-24 18:00:20 +00:00
Automerger Merge Worker
50bd5698ef [automerger skipped] Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: e987aeecde -s ours 
am skip reason: Change-Id Ife215d0901bd9fc3055495b0495ba175ed0dfa26 with SHA-1 5f503b87ea is in history

Change-Id: Ie6f82b5ca7e409d9148af938fd4318ee8770d0a1
 2020-02-24 17:46:58 +00:00
Automerger Merge Worker
51816dea20 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91 
Change-Id: I44d40b631ac49e89a5f7a02626d10022364cef14
 2020-02-24 17:46:52 +00:00
Automerger Merge Worker
f6ae9a4864 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c am: 5228fbbb91 
Change-Id: I6a366015c4458c04ff67cfe9d610ef272f751454
 2020-02-24 17:46:43 +00:00
Automerger Merge Worker
e987aeecde Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c 
Change-Id: I503efe54953615b70760d817cff50a438316e424
 2020-02-24 17:31:43 +00:00
Automerger Merge Worker
5228fbbb91 Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev am: cdc7fffd2c 
Change-Id: Ie76c3c24f331a3dc741075ab8f8a1a64dc38a163
 2020-02-24 17:31:33 +00:00
TreeHugger Robot
cdc7fffd2c Merge "Set ClearDefaultsPreference as unselectable for talkback" into rvc-dev 2020-02-24 17:22:49 +00:00
Automerger Merge Worker
3042e81948 Merge "[automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: b916ae9135 -s ours am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history" into rvc-qpr-dev-plus-aosp am: 9d584ced7f -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: Ic49ca82fda3859712c48a13757f6983d6d7ccdcc
 2020-02-24 16:05:35 +00:00
Automerger Merge Worker
23c6b9b79e [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: cff703ccb9 -s ours am: fe6a2d20fa -s ours am: f657fe78aa -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: Ide8bff6a82b296e9cf19a509d688627bdf69bb40
 2020-02-24 16:05:28 +00:00
Automerger Merge Worker
fd13787154 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: 30a21c11a3 -s ours am: 656b6e491c -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I94d90e43060c8d3a082007a95ca8c5d340938820
 2020-02-24 16:05:19 +00:00
Automerger Merge Worker
9d584ced7f Merge "[automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: b916ae9135 -s ours am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history" into rvc-qpr-dev-plus-aosp 2020-02-24 15:48:30 +00:00
Automerger Merge Worker
f657fe78aa [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: cff703ccb9 -s ours am: fe6a2d20fa -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: I385d6921bbbea3dddf0ff4952bc59e4984ce11ab
 2020-02-24 15:48:28 +00:00
Automerger Merge Worker
77f2cb26c1 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: b916ae9135 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Ia5d89c00d870011d5eb609cf99815d95d6153399
 2020-02-24 15:48:23 +00:00
Automerger Merge Worker
656b6e491c [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours am: 30a21c11a3 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I515a7dab7f2b7ed6f4c3223dc0f08c03bcbe005c
 2020-02-24 15:48:21 +00:00
Automerger Merge Worker
b916ae9135 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I63a148bd765d6d3d56249ac11f6f7cc04238b609
 2020-02-24 15:30:52 +00:00
Automerger Merge Worker
fe6a2d20fa [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: cff703ccb9 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 ef009cc832 is in history

Change-Id: I395fbdeb7daffbee72f4b744439e279b66a1e967
 2020-02-24 15:30:51 +00:00
Automerger Merge Worker
30a21c11a3 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours am: 35294a1532 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I3524d32759c97cce78da380f4de3c0a768705be0
 2020-02-24 15:30:42 +00:00
Automerger Merge Worker
cff703ccb9 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: I015da63fc64ac8bbd35b64c7f30eed2ee84d93b8
 2020-02-24 15:18:24 +00:00
Automerger Merge Worker
35294a1532 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours am: f9779a0435 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Id69bc466f138dc5db47a853b01ed09507048e5b7
 2020-02-24 15:18:08 +00:00
Automerger Merge Worker
f9779a0435 [automerger skipped] Fix volume panel crashing am: ef009cc832 -s ours 
am skip reason: Change-Id I3d162f6d2f1035b81b1b2eb915b488084e7ea36e with SHA-1 fcd9f1a870 is in history

Change-Id: Id3bf8f851a257a95cbdb747dc7f7f93b71ae7d26
 2020-02-24 15:06:03 +00:00
Automerger Merge Worker
c881ad250e [automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp am: e1763f51db -s ours am: b9e2881321 -s ours 
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a084909 is in history

Change-Id: If4e7c3ebaf64b8512ad5f05cf2133fa055322a98
 2020-02-24 12:15:53 +00:00
Automerger Merge Worker
d133859e39 [automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f am: daaa66f844" into rvc-qpr-dev-plus-aosp am: 8d782dbcf9 -s ours 
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a084909 is in history

Change-Id: I2168ccf6aa5a87508e88e0665a97a7edddefcadc
 2020-02-24 12:15:30 +00:00
Automerger Merge Worker
808803ef73 [automerger skipped] Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 33b626bd9f am: 1904c8958e am: 1c2d806f69 -s ours 
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 377125bf96 is in history

Change-Id: I09c223384dddd10cb5ad96468642428e2320fdb3
 2020-02-24 12:15:13 +00:00
Automerger Merge Worker
b9e2881321 [automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp am: e1763f51db -s ours 
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a084909 is in history

Change-Id: Ie6ff61d44fc3cc8a0b092fbd72fd4bef49c3bcc7
 2020-02-24 11:59:27 +00:00