Commit Graph

94213 Commits

Author SHA1 Message Date
Bill Yi
18e9683196 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 27b0252afa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0464c880c88013e7a6ead0984a8981f281c2df95
2021-08-17 20:39:43 +00:00
Xin Li
7238a80218 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours am: 0313c67921 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: I167be22eeb7eaf97356aa60928b5f63bca23d291
2021-08-17 20:32:38 +00:00
TreeHugger Robot
9aeb396178 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b04dbbc9369c89ca837fe2dccb86a3c9445dbdb
2021-08-17 20:28:48 +00:00
Bill Yi
3e49192ffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I983cb558895e64cd0455dbe51eb169e0fe7bd634
2021-08-17 20:28:41 +00:00
Bill Yi
02b5415b3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21a0af17579c11c689e78382f4fe1e16bc91b416
2021-08-17 20:21:42 +00:00
Bill Yi
27b0252afa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60a5373e66911dbf1652d49b385dd78c46ec79ac
2021-08-17 20:20:53 +00:00
Bill Yi
1ca3b46718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0fd26a73fa93e5e592efc6d2259bd9e83dac2b04
2021-08-17 20:18:16 +00:00
TreeHugger Robot
186c4d6e63 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:18:07 +00:00
TreeHugger Robot
1b205fbb03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: 8013ac32c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6c607caee526934a3881076ef940b82e65d27fc
2021-08-17 20:15:11 +00:00
TreeHugger Robot
bedcd7dcf9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: 3c63e65b2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ff0cd7576de8189386738962d9178696784125f
2021-08-17 20:15:06 +00:00
TreeHugger Robot
dd0e1a338c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-17 20:14:28 +00:00
TreeHugger Robot
413f1db6c6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:10:00 +00:00
TreeHugger Robot
3ceb76595f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5 -s ours am: 2ace4acb04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0cadc4ad8f9effaea9853c026d9a13f4bfb979b
2021-08-17 20:07:02 +00:00
TreeHugger Robot
7ed74f52bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb -s ours am: 70a5bd4c62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42d5610e565014cd40e02fdef3fd1742508cbb04
2021-08-17 20:06:56 +00:00
Bill Yi
fa3505fdd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
2021-08-17 20:06:51 +00:00
TreeHugger Robot
ed4f4693c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9a9c923f760ac6cd829b2606f84c57c2b5ae0cd
2021-08-17 19:56:50 +00:00
TreeHugger Robot
d9754e6900 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a8a5b3f77780d0b5923784cf7360869a5929ea0
2021-08-17 19:56:23 +00:00
TreeHugger Robot
8013ac32c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iacbf620cd9e7bfffe08a9027ccdcee0e9e2f47d9
2021-08-17 19:56:21 +00:00
TreeHugger Robot
3c63e65b2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I45e2a124c17b21a9202e6101dbb645c62a62522e
2021-08-17 19:56:03 +00:00
TreeHugger Robot
2ace4acb04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I365e1ea376400e8027b52a72f095dae5797347f7
2021-08-17 19:50:01 +00:00
TreeHugger Robot
70a5bd4c62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I762388b6d96ba80d2f5c632dc16ce812c607aad1
2021-08-17 19:49:47 +00:00
Xin Li
0313c67921 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: I1456d89f8a7d4bbc347715fbf9ac8150db07e075
2021-08-17 19:46:34 +00:00
TreeHugger Robot
1bdc58284d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:46:30 +00:00
TreeHugger Robot
6a41d25bcc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:44:13 +00:00
TreeHugger Robot
478207eda5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-17 19:39:11 +00:00
TreeHugger Robot
a1c58e43cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-17 19:31:32 +00:00
Xin Li
c1853be4d0 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: Ib85f7f13d04e651389e95994dd4854b92292a34b
2021-08-17 18:36:03 +00:00
Xin Li
7d646a5182 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:14 +00:00
YUKAI HUNG
55eba2589c Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b am: c4234a86a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411

Change-Id: Iafcdf0f301f859b4ad78b991e22f846cc9ab28a0
2021-08-17 17:48:09 +00:00
YUKAI HUNG
c4234a86a8 Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev am: 0a308d056b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15583411

Change-Id: I547b749bf8186e08ef33f7eb7635842b4895d1c8
2021-08-17 17:27:51 +00:00
ykhung
5589007530 [QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.

Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
Merged-In: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
(cherry picked from commit 518d6df4f4)
2021-08-17 17:14:29 +00:00
YUKAI HUNG
0a308d056b Merge "[Security] resolve RequestIgnoreBatteryOptimizations info disclosure" into sc-v2-dev 2021-08-17 17:10:26 +00:00
Treehugger Robot
1254e6b856 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 am: e016e0b03f am: e53111b6a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56db10cad198f321a3146b70f0f760cd71e67afd
2021-08-17 10:01:24 +00:00
Treehugger Robot
e53111b6a0 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 am: e016e0b03f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I49dcaf8ffe6c206087ac920b18fa73f36a2c2a39
2021-08-17 09:48:26 +00:00
Treehugger Robot
e016e0b03f Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
2021-08-17 09:22:56 +00:00
Treehugger Robot
2fbbcd3d9d Merge "Add biometric OWNERS to unit tests." am: 9689490c22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I355edf3a1ff7efb93a3c8eff94bb77104e60a5cb
2021-08-17 09:12:11 +00:00
Treehugger Robot
9689490c22 Merge "Add biometric OWNERS to unit tests." 2021-08-17 08:43:12 +00:00
Weng Su
1fe8220afa Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-08-17 08:14:55 +00:00
ykhung
0791d77df0 [QPR1] Add time unit into battery usage chart and refine some UI
- add time unit into battery chart for 12/24 hours
- refine the radius size for chart bar
- use fixed font size for timestamp and percentage

screenshots:
24-hour format: https://screenshot.googleplex.com/3VNedE2nAx6LrXu
12-hour format: https://screenshot.googleplex.com/3tpTXjYfrasrenW
fixed-size: https://screenshot.googleplex.com/nPRKm7XCkmFzW6K

Bug: 194836607
Test: make SettingsRoboTests
Change-Id: I5b35b0fa808eb8a5f607962ee973c2896529b078
Merged-In: I5b35b0fa808eb8a5f607962ee973c2896529b078
2021-08-17 06:09:56 +00:00
Bill Yi
7ff4b20c22 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1a80b91df8a3a635763fc178757662a07df3874a
2021-08-16 22:59:49 -07:00
Bill Yi
73f4597617 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib8067f7f7b9ce0b3c3c9b164c16c2124754259f4
2021-08-16 22:54:27 -07:00
Bill Yi
81c97af835 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 2p: 8d94de2962
Blank merge reason: parent was merged -s ours

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

Change-Id: I4dac108fb9b72bb7180e3870ac0133ee0f4138c3
2021-08-17 05:49:52 +00:00
Bill Yi
635d7a2949 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
Blank merge reason: commit message contains skip directive

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

Change-Id: I4c5f57616aa0bda605f4fcd4f7de90a6c8b64853
2021-08-17 05:49:49 +00:00
Bill Yi
8d94de2962 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
Blank merge reason: commit message contains skip directive

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

Change-Id: I82e01f7a48919bec7e5d1d97788d7b72e239d831
2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
2021-08-16 22:49:25 -07:00
Bill Yi
a9674f1e17 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I645acc726b56601af6ae2a58959dd514a1140ee2
2021-08-16 22:44:16 -07:00
Bill Yi
33816cbd55 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icc69636a8f76732319cc24c5bf7e842150ab5692
2021-08-16 22:39:23 -07:00
Bill Yi
d49b8b74d0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
2021-08-16 22:37:14 -07:00
Bill Yi
1f5111f15b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 2p: 1e656787ee
Blank merge reason: parent was merged -s ours

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

Change-Id: I28137b9f9c63c7247fbbed413bea2d7e7e080484
2021-08-17 05:35:24 +00:00