PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,509 Commits 1 Branch 0 Tags
90168c06dd3fea000be1784cc69b3f621f2fe51c
Commit Graph

104509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
2a413effed Merge "Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: 82e1dbfbe4" into tm-d1-dev-plus-aosp 2022-05-23 15:59:01 +00:00
TreeHugger Robot
a136aade8d Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: 82e1dbfbe4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I3ca14d45daa9d3af34d2fe05ed1d2edae2645eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:58:58 +00:00
TreeHugger Robot
768cc4e9a8 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 am: c59c58e1d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I6c9503a503d4f31b3982a912461b838f715a19d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:58:57 +00:00
TreeHugger Robot
c59c58e1d3 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: I9f1a431164072830f6072a120adbaf125b325e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:32:33 +00:00
TreeHugger Robot
82e1dbfbe4 Merge "Fix crash when operator name contains %" into tm-dev am: 39eb991aa7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556455

Change-Id: Ia3a06bbe0edbc369cb71a2a4f807a2061aff5783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:31:00 +00:00
TreeHugger Robot
39eb991aa7 Merge "Fix crash when operator name contains %" into tm-dev 2022-05-23 15:16:36 +00:00
Automerger Merge Worker
9ffd7ecd8f Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours am: 19f9b738f7 -s ours
  [automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6 -s ours am: c9a5086f3b -s ours
 2022-05-23 15:07:43 +00:00
SongFerng Wang
45fa5ccf19 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours am: 19f9b738f7 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Ie86bc8f0ba092eb1dd17033a1db0b7e416489f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:39 +00:00
SongFerng Wang
8b4806562e [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Id4019f316ea642eacf4820e16c4c3b6d70609d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:38 +00:00
SongFerngWang
aef126d3e6 [automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6 -s ours am: c9a5086f3b -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I2841769e5425b26a7b9033c11a17436d277a4aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:38 +00:00
SongFerng Wang
a0553c9d16 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454

Change-Id: Ib62bae9b56074c7e7dd2d3a652f6a4075cf78e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 14:50:28 +00:00
SongFerng Wang
19f9b738f7 [automerger skipped] Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: Iba28e980ce4e2dfd37375761f96396c816ca7086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 14:48:48 +00:00
SongFerngWang
c9a5086f3b [automerger skipped] [LE unicast] Disable the "phone calls" when LE is enabled am: 0167a4d8a6 -s ours 
am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 5350643e7a is already in history

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

Change-Id: I112177ccab0ef01edad24830e01503390471e5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 14:48:45 +00:00
SongFerng Wang
96bd20dca4 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev 2022-05-23 14:23:39 +00:00
tom hsu
7e27ecb91e [Panlingual] Fix icon shall have work badage in work profile. 
Bug: 233064114
Test: local
Change-Id: I8aa24373f0381b172c30d16aedb2f9ba97238234
 2022-05-23 19:34:51 +08:00
Treehugger Robot
fe16309442 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 am: 38f8c61722 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I4effb7ecf2aeec745a6e6918ca80f76ef1d58478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:51 +00:00
TreeHugger Robot
cffca31ba3 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: 07cb063579 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: Ice4443404f8d4d73c69db8fec4510069fa1a367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:42 +00:00
Treehugger Robot
38f8c61722 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 am: 2b7eb9eff6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I9e3a0b69e3baf2c0691c898acda20d6a0b65b953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:27 +00:00
TreeHugger Robot
197b3072b5 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I87164cccc6b47247bb4db42d122f301c75647d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:16 +00:00
Chaohui Wang
02eb0aa980 Fix crash when operator name contains % 
Currently, cannot use ListPreference.setSummary() when the summary
contains user generated string, because ListPreference.getSummary() is
using String.format() to format the summary when the summary is set by
ListPreference.setSummary().

Use preference.setSummaryProvider() instead, which is recommended for
ListPreference.

Fix: 233295254
Test: manual
Change-Id: Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39
 2022-05-23 19:02:20 +08:00
TreeHugger Robot
ac572e72a6 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I0a317f53e6578ee245d54c3993267ab08d803161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:53:24 +00:00
Treehugger Robot
2b7eb9eff6 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I5685d61f33acf4fbf4b5ff8356a487f77d314bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:52:07 +00:00
TreeHugger Robot
07cb063579 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I470de9e89f9b36b2797a8260d7617e96712c52da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:51:57 +00:00
TreeHugger Robot
02d3965634 Merge "Simplify the duplicate click checker logic" into tm-dev 2022-05-23 10:24:18 +00:00
Treehugger Robot
97b4621c68 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" 2022-05-23 10:21:02 +00:00
SongFerngWang
0167a4d8a6 [LE unicast] Disable the "phone calls" when LE is enabled 
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
 2022-05-23 17:34:48 +08:00
Håkan Kvist
6f1b6e3693 Call CardDatabaseHelper.getInstance() when used and not in onCreate 
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.

Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.

Test: Start device with sim card inserted and Pin enabled on sim.
  Wait some time before entering sim pin. After entering pin, open
  settings. Verify that settings does not crash.
  Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
 2022-05-23 09:08:30 +02:00
Bill Yi
3304393c1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id728bf2c000929f278e02cf915b05f78fcff9a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:30:12 +00:00
Bill Yi
de1793faf0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93bd4dff9d8e5eb14a6c97ad61b8dace102f84b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:29:26 +00:00
Bill Yi
c3d4eb094b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99b5282130809460605bf2af7a56d466b6752e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:09:38 +00:00
Bill Yi
153aaf7682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f2c0c4b54bccf5e3e6966297d08813d27aeac7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:08:17 +00:00
Jason Chiu
5bc2dc4ae9 Simplify the duplicate click checker logic 
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
 2022-05-23 12:57:19 +08:00
Bill Yi
750cea242e Import translations. DO NOT MERGE ANYWHERE 
BUG:233440940

Auto-generated-cl: translation import
Change-Id: Idbd4c9ec8105849b762afae06c780c47185fda65
 2022-05-21 09:20:58 -07:00
Automerger Merge Worker
7a395263d5 Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours
 2022-05-21 02:29:00 +00:00
TreeHugger Robot
8c1aed12ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I198c568a7c5ae92f0a86c1fd2dcdfea9609d0739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:55 +00:00
Bill Yi
3ffb54a1e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25debac8937a771f3ef19488192f3c31bfc806c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:53 +00:00
TreeHugger Robot
c71ecb31e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: be66d387e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddb0b76e5d5ca58e1fd454bf552c5c33323ea62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:51 +00:00
Bill Yi
de09c13ece [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: ea8b3f83b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I973d31e95ee41c512eccd7b31dac06b962475afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:50 +00:00
Chaohui Wang
849dba46a3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: If64e9a2f5e885f90b949485a781f8dd6459a0984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:38 +00:00
Chaohui Wang
456a27bee3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I3b9ae5d0e02db28f8965d158d97937b8b2603433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:32 +00:00
TreeHugger Robot
e393321e1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf8567fee996c979796c8507b70d4f48729a5313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:19:17 +00:00
Bill Yi
b13cc8ca4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11f86d958b411818eb7a549bf0bf6d783c564943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:19:10 +00:00
TreeHugger Robot
be66d387e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6001aab1e0cbac0515c44f40a92d2486ff58f49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:17:56 +00:00
Bill Yi
ea8b3f83b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id60653015a9a4344e2428a51390806f449f4ea4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:17:40 +00:00
TreeHugger Robot
97a3f54878 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-21 02:12:55 +00:00
Chaohui Wang
f61254af3c Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I59fbcd9e9646f2a7fab8fd0410768b08b06f6512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:10:18 +00:00
Chaohui Wang
0d6569d199 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I911dc4f729e7d6eeb0fda8b12f16d8a153cb6bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:08:39 +00:00
Chaohui Wang
0dc89bc85c Merge "Fix Conversation page flickers when back" into tm-dev 2022-05-21 01:54:27 +00:00
Edgar Wang
2e995ee697 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I8687407c4c7c99015bc38818b9a1beb681a3e1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:52:50 +00:00
Edgar Wang
21ddf79998 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: If0fba8bf4c69645bf8cc6a153580ed7cda57610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:51:54 +00:00