PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,127 Commits 1 Branch 0 Tags
82ed2bc190ce96dcc2882c2af86d1e1db400078f
Commit Graph

104127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Chapin
82ed2bc190 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 61ffcb9b61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I7a9feb3c1ca919dd615ca6475c32e1086ba353fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 01:11:33 +00:00
Daniel Chapin
3a1eb1da63 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 am: 1c432c5a1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I3651532bb9ec4d60c4cf1b51ebd4447d8728fe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 01:11:20 +00:00
Daniel Chapin
1c432c5a1e Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: I6f97b69e20648341043bbdfff4e8d28ca62b7d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 00:43:16 +00:00
Daniel Chapin
61ffcb9b61 Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290

Change-Id: Id94e14072b159e13ae5d42f3c6aded5c8fae8404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 00:41:38 +00:00
Daniel Chapin
fa878f2f26 Merge "Fix crash for DefaultSubscriptionController" into tm-dev 2022-05-25 00:22:04 +00:00
Chaohui Wang
2e34038233 Fix crash for DefaultSubscriptionController 
setSummaryProvider() is used instead of setSummary() in
Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39, but there is still a place
using the setSummary(), mixing these two will lead to crash.

Change it to setSummaryProvider() to prevent crash.

Fix: 233295254
Fix: 233712251
Test: manual
Change-Id: I4627545711b848009c3bd7179f0368ff82e62697
 2022-05-24 16:51:51 +00:00
TreeHugger Robot
84c8dd38e6 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 19589d5bb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: I7e94225cdf291655074e87a2bef8b70b3d65a8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:37:56 +00:00
TreeHugger Robot
d8216ec3d5 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f am: 0dc5eff113 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: Ica7fc11c05ff72f5fd8ba566cf2be39e77225c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:37:46 +00:00
TreeHugger Robot
0dc5eff113 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: Ie33b331b8facb0d59287bf445dd93bee1054cbe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:03:03 +00:00
TreeHugger Robot
19589d5bb4 Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252

Change-Id: Ie40e649eb7e9ffd0859a0bd3af839bc7d647146f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 13:01:26 +00:00
Edgar Wang
356ddd45ac Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 9b81fec6a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I17f8d143eaedb2f9e2303d1c1460132e53cb6abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 12:54:03 +00:00
Edgar Wang
73f218bd81 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 am: 0c461ec850 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I33097744676c47efd61fe8eb242cddf0a9843e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 12:45:28 +00:00
TreeHugger Robot
74c324b70f Merge "Fix can't start injected item problem" into tm-dev 2022-05-24 12:41:46 +00:00
Edgar Wang
9b81fec6a0 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I93c94eee39fa5ea786632b04498ba99eecc02eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 12:29:09 +00:00
Edgar Wang
0c461ec850 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669

Change-Id: I38b97fd064bfaddde409a6c9bffc5a10d4dc9e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 12:27:34 +00:00
Edgar Wang
4c07e2b865 Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev 2022-05-24 12:07:41 +00:00
Victor Chang
330934cfb5 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 am: 5aada33242 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I7208109922af4f7e2bf7aa67e4ee599164eff16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 11:29:37 +00:00
Victor Chang
5aada33242 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: I8b616af8d02a6d984d7dbec2b50087242958dd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 11:20:54 +00:00
Victor Chang
d5ab7dc729 Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605

Change-Id: Ib0ad04ef4c225fbc449abed9913381d6c8d3a138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 10:53:20 +00:00
Victor Chang
ba69fd0d3f Merge "Reland "Don't use framework strings for formatting file sizes"" 2022-05-24 10:04:46 +00:00
Binyi Wu
311e40ce4b Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 2331e4b511 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I50ed51405f483c4072aa20a72208ca06be119ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 09:44:32 +00:00
Binyi Wu
7c5f75c221 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 am: 3ea7d18309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I6e8a23ab2074f976b646ac46cefee5e8fd725fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 09:44:08 +00:00
Binyi Wu
2331e4b511 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: I513978e2c436055ac1269fd4795d11c48b0ddef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 09:17:12 +00:00
Binyi Wu
3ea7d18309 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457

Change-Id: Ice082991ab8157716aa910ee15ad2c7fa8096086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 09:15:28 +00:00
Binyi Wu
8fd6873250 Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev 2022-05-24 08:32:03 +00:00
Arc Wang
03d8d11914 Fix can't start injected item problem 
Should set highlight Preference key after
isDuplicateClick to ensure clicked Preference
key & highlight Preference are different and
then isDuplicateClick returns a correct value.

Bug: 233553587
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
      manual
      1. Click all left pane items and see if there is any launch problem.
      2. Check if duplicate click check works.

Change-Id: Ic6394b96896fd3a0fb926707565f63beff74a27b
 2022-05-24 07:13:35 +00:00
TreeHugger Robot
c468b7f873 Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc am: 62050f266a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: I9582436cffe9ddfc18e2b803e79262effe0192bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 05:14:11 +00:00
TreeHugger Robot
eb9df278da Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc am: 9ba22d2ec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: I3498483e5e73d28151b5ac151ca05b2f375f9333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 05:14:06 +00:00
Edgar Wang
2b0d9cfc5d Fix talkback speak "double tap to activate" on LabeledSeekBarPreference 
- SeekBarPreference should be unselectable
- remove unnecessary handling of Summary
- set currect Title color when preference is enabled and unselectable

Bug: 230553896
Test: robotest
Change-Id: Ie5d819088dc3c435005ddd00e232b2f6992b234a
 2022-05-24 05:08:16 +00:00
Binyi Wu
26e5e919c8 Prevent keyboard from blocking the input box for WiFi configuration page. 
Bug: 223980567
Test: manual
Change-Id: I2b95b065394e2395396ff71b00bd949ac824dac3
 2022-05-24 12:50:41 +08:00
TreeHugger Robot
9ba22d2ec9 Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: I05b01fbce6e6e1dc51cd5bdad2d9fdd0a80bb068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 04:42:47 +00:00
TreeHugger Robot
62050f266a Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664

Change-Id: I062ee27af956efba4246b377f797bf11df9b43de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 04:42:12 +00:00
TreeHugger Robot
020ac9fb19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d -s ours am: 17093f454c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09d9455cc2b417845eac29b6e453c6f220618a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 04:04:55 +00:00
Bill Yi
fd2febf4bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302 -s ours am: 410d895879 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida8ee47cf088bb8f90ef77e766757f562e9084dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 04:04:41 +00:00
TreeHugger Robot
d9174aa3cc Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev 2022-05-24 03:51:23 +00:00
TreeHugger Robot
32b6f4d04a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d -s ours am: 56c0920c7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17da409229164eefaa12b2dace1803feb2403859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 01:23:24 +00:00
Bill Yi
012a641355 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302 -s ours am: 6adb47ebfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33c2e7c1b3ef8eebf11ec51b513bff3254d266d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 01:23:10 +00:00
TreeHugger Robot
56c0920c7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I037cb6676fd41cb985c7bffcb0bb17535a7270b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 01:00:08 +00:00
Bill Yi
6adb47ebfa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I989eaca89d3cb7666d68d5ce2f889fcbdc6ab316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 00:59:56 +00:00
TreeHugger Robot
17093f454c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbf5b2d45f16c91642b1365e806c94224150a421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 00:59:22 +00:00
Bill Yi
410d895879 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82befbbb0ca1534c2fd0c892c892592358113773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 00:59:05 +00:00
TreeHugger Robot
0a367dea1d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-24 00:38:21 +00:00
Automerger Merge Worker
71ab33b3b5 Merge changes from topic "am-14fdde8e45c44bc8aa7d94ffcc435b82" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: c484ac981e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: 9ba1e26bdf -s ours
 2022-05-23 20:04:23 +00:00
TreeHugger Robot
91d1f44c86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: c484ac981e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibda2b1982845ff3d9b9ad301f44ed3c93ebd2379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:03:36 +00:00
Bill Yi
ecb40fa5e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: 9ba1e26bdf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea1dd7b645779cc9a983e630beb24d40be691a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:03:18 +00:00
TreeHugger Robot
3c902f3518 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours am: d8e9a267cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa4dffc007ac27956b5463bc4d7e679adae4e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:03:01 +00:00
Bill Yi
7b032170cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours am: ea5907aeae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c2dbff72e3579fcabd5f26719dc0e2f1ed623a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:02:45 +00:00
Bill Yi
aae3efd3a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b -s ours am: d28e552f18 -s ours am: 2cc27bc744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c477aa374db4dbfd149e20bd37152c5abef6bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 20:01:55 +00:00
TreeHugger Robot
d8e9a267cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab -s ours am: 5fdd0b386f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3faca04cf31d63cf8336ee8acab098cb450704f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:44:46 +00:00
Bill Yi
ea5907aeae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71 -s ours am: 6db82b3062 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0375c5e00aa7a6a8fef1b96407e624359363908d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 19:44:30 +00:00