Commit Graph

109018 Commits

Author SHA1 Message Date
TreeHugger Robot
3588b515f2 Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303

Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 06:01:14 +00:00
Wesley Wang
a0c76c92a1 Merge "Update extra defend layout string" into tm-qpr-dev 2022-08-24 05:11:03 +00:00
YK Hung
821c5702cd Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev 2022-08-24 05:08:48 +00:00
TreeHugger Robot
adf79eae3e Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev 2022-08-24 05:04:05 +00:00
Betty Chang
3852ceab9b Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826

Change-Id: I7a4f1366a1481e303afe73f21320cd3c421015e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 03:51:23 +00:00
tom hsu
3aa4440b36 [Panlingual] Improve conditions of supporting app locale.
There are 3 conditions we need to check.
  1. Has locale config file
  2. Has locale config file w/o content
  3. Has locale config file w/ content

 Currently, we do not have condition 2 into the condition group, and we
 need to add it into.

Bug: b/243099750
Test: Manual
Change-Id: I58d0275af53031ba4f4c705022017d5143f45795
2022-08-24 03:39:35 +00:00
tom hsu
e6b46dc853 [Panlingual] Remove featureflag of app language.
Panlingual successfully landed. Hence, we can remove the feature flag
 right now.

Bug: b/209775925
Test: atest pass
Test: Manual test pass
Change-Id: I464a206027fd63ee1763acaf17d1b6251e839bc0
2022-08-24 11:29:31 +08:00
tom hsu
3cbb6f8680 [Languages] Add new information to system language page.
- Add top Intro preference
 - Add footer preference
 - Add sub string to language picker
 - Modify title of app locale pages

Bug: 242182598 Add information to system language page.
Bug: 241600418 [Panlingual] Change strings on App languages
Test: Maunal test
Change-Id: I9bca8911e8e70c97c273294b3c9d1d73d4ea0cb2
2022-08-24 11:04:24 +08:00
Betty Chang
f14071682f Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev 2022-08-24 02:55:13 +00:00
Bonian Chen
534dbdfd29 Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214

Change-Id: Ib5200b5c3a0cbf87fc8a8de5991742847b924049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:50:09 +00:00
Bill Yi
a6e3a37237 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 7c8eb553f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I297f2dc5429b7a5d3bd0384766e2c1b7037efa43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:42:09 +00:00
Bill Yi
77f4742278 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 44b8eef34f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I920696223f019b3eff5ad37094cd4253bbb8a2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:41:52 +00:00
Bill Yi
ffb58bd57f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: a508e939b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3d30220f0640686211033bcddad7731ee7ecb48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:41:27 +00:00
Bill Yi
b55ee3e40c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 0bc186ced0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fa6be28773a7a887007d81402bb8e456a3ac919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:41:05 +00:00
TreeHugger Robot
f4a4722c33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: bf23a06eac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I66be52d039371640b6bcbf4df1fe8c3ab8b5dffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:27:13 +00:00
Bill Yi
2c63bb5b09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours am: 637265f9ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I152fc992e09d34a12b52f4b09d86b7c28ad3854c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:26:55 +00:00
TreeHugger Robot
d1c096bc56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6e9ba1100 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib19ca47d04b3f250201329826b64f9e6e8b51c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:25:15 +00:00
Bill Yi
906b408520 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23c81a0a7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5aaf8ae1adbc7f578b9ea6dc76d75b1a6c68f3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:24:50 +00:00
TreeHugger Robot
7448a4df9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa53f6fafe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f398660f3f7eb4b0a8ad0823302ed6b3215a100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:24:32 +00:00
Bill Yi
c7e2c34520 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31ea59660b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0bf5cd74a3c2a05f9e62346c7377cbdac3e3aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:24:19 +00:00
Sayak Dutta
3985485b3a Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev am: af11c676a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19682757

Change-Id: Iae792a3cb815612047ffb2c14fee3c40a19653d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:22:51 +00:00
Bonian Chen
9bdca3ba92 [Settings] Data warning & limit UI should be configuable when running out of limit
Should access API which is irrelated to status of data limit.
Changing from API isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
into isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER).

Bug: 223361190
Change-Id: Iada89de38e9db3706a944c7a5b5f8a3e87d415e5
Test: Manual
(cherry picked from commit 7e530dda39)
2022-08-23 18:37:08 +00:00
Bonian Chen
105cda2fbe Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev 2022-08-23 18:14:32 +00:00
Bill Yi
c29ab9bf8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 5c691c0670 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea672469f43e5b1deda5fb6c7b75ba79c5c9adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:37:08 +00:00
Bill Yi
78aece0998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 60f828e428 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idff7c99bf3926e4138799fa53bc0317306a9158f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:36:42 +00:00
Bill Yi
56af244b80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: 9281ec1752 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13c2baa859f086fcb43624b88be0f5de477caf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:36:23 +00:00
Bill Yi
1c41a160c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 381f37b918 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fc668bfd5013261e8a3205af9aa15f20edc14ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:36:09 +00:00
Treehugger Robot
cb302284e6 Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d am: 1467de15bc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: Ie73421bb80637e58b04772e20289a38d22a2a708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:35:06 +00:00
Bill Yi
5c691c0670 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad5a8f14604bcba021c13146ec1b0b4fb2d11681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:23:20 +00:00
Bill Yi
7c8eb553f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib88833c3b66e745fd0057f324f06cb2e91d74156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:23:00 +00:00
Bill Yi
60f828e428 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd342af76d5df98b8855635e5fdac9097dc66335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:22:55 +00:00
Bill Yi
9281ec1752 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ce860ad406c50b616e86eeb03d341dc422cff4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:22:35 +00:00
Bill Yi
44b8eef34f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I427f1711a9ba96028188f84b0065478d82063d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:22:31 +00:00
Bill Yi
381f37b918 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I832faea9d0f28e85e4ce5fc7c796bf0d94a093c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:22:18 +00:00
Bill Yi
a508e939b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11c3a1c5f69dada5b7d1ec2d74cdb46f34e8b678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:22:09 +00:00
Bill Yi
0bc186ced0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice10cfe5937d454d09b7e6e75c22060d7ed5300f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:22:04 +00:00
Treehugger Robot
1467de15bc Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I6ffe3f49c01d692a9eb1c77030be732be204ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 14:17:42 +00:00
Treehugger Robot
4c06c2426d Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: If151337acb399e3ce8ab733eb44d2cc6a9ef0484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 13:59:51 +00:00
Bill Yi
1be27e97c5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-23 13:56:32 +00:00
Bill Yi
1a3d6c47c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-23 13:56:32 +00:00
Treehugger Robot
280ad76afb Merge "Fix always return first package for mock location app in developer options." am: d221269892
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I66bdf2036d3a3af348137b07a1b2b9edb29d1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 13:38:27 +00:00
Treehugger Robot
d221269892 Merge "Fix always return first package for mock location app in developer options." 2022-08-23 13:15:51 +00:00
Pajace Chen
b00140b7a3 Reduce the calling times for isExtraDefend
Only calling this HAL API when BatteryDefenderTips card need to be shown

Bug: 243465597
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: Iae3c03d946ec29fe78a826ce62b6bebd893704ef
2022-08-23 20:15:50 +08:00
Zaiyue Xue
2a57f5de8d Port battery usage bug fixing cls from master to tm-qpr-dev
This cl is a merge of the following 5 cls:
ag/19674112	Fix b/242989581: The two battery charts have the same label
ag/19667114	Support data logging for battery usage new chart view
ag/19636171	Support data logging for battery usage new chart view
ag/19682758	Resolve insufficient contrast for system component icons
ag/19697763	Add fade in animation for battery usage chart group

Bug: 242989581
Bug: 242810430
Bug: 242989982
Test: presubmit
Change-Id: I39cd0f88ce62a280a966750082a40f8a537b9616
Merged-In: Ice30508bc20b5de631efee0db0160fe6ad710dbb
2022-08-23 19:30:49 +08:00
张倞诚
d8d0cb3532 Fix always return first package for mock location app in developer options.
The mock location app should be OP_MOCK_LOCATION allowed app, the packageOps.get(0).getPackageName()
is the first app that used the OP_MOCK_LOCATION in history, but maybe rejected.

Change-Id: I0158436dd7d2790f4e9640075bc9c8bd3422f467
2022-08-23 07:50:16 +00:00
Automerger Merge Worker
f2220437ba Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: ad5444df28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393

Change-Id: If3d42aa8f43328404c65ee659d1a5ebb438149b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 07:12:13 +00:00
TreeHugger Robot
614943029f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: a31f4bd4de -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic97a2bd6beb54d3d555b80ed0377714f7ec0c04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 07:11:58 +00:00
TreeHugger Robot
7132b78cd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -s ours am: 9313d8a22a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id693f540436ffd8fe8a8745aaaa737ae667213f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 07:09:09 +00:00
Bill Yi
7bef9eab0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -s ours am: 03694f9b15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idacf29303b59a4c8d8995b81e77a6ebcc018472e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 07:08:51 +00:00
Automerger Merge Worker
ad5444df28 Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours
2022-08-23 06:52:09 +00:00