Commit Graph

85210 Commits

Author SHA1 Message Date
Yanting Yang
802af0f016 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: Ic18f30f5f10d2e75d3f9aab119666ecc82091383
2021-05-14 18:34:37 +00:00
YUKAI HUNG
70f34c947e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 am: 8bfc40046e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: If86edd6d47b199e001ee0bb672f96f3075983fc2
2021-05-14 18:17:56 +00:00
Yanting Yang
89cd044bd7 Merge "Remove silky flag from homepage for official release" into sc-dev 2021-05-14 18:13:29 +00:00
YUKAI HUNG
8bfc40046e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I92fcdbabb74151b33dd71aacafddb81cff3fccda
2021-05-14 17:57:07 +00:00
YUKAI HUNG
0ef403044f Merge "Add battery usage metric" into sc-dev am: d2d7d89de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: Iad2ff218185ead6d3c7ce24372f70b409a6e2f2d
2021-05-14 17:47:45 +00:00
YUKAI HUNG
65b5d9706e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I4a45edac90e4291bf32656f0944b5fa6a63fb3fd
2021-05-14 17:47:09 +00:00
YUKAI HUNG
d2d7d89de6 Merge "Add battery usage metric" into sc-dev 2021-05-14 17:22:10 +00:00
Abel Tesfaye
8a8ad35cd0 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 am: 29a695b0c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: Ida4f97953c22b8ea942f94557c95efb24e6f88db
2021-05-14 16:35:07 +00:00
Abel Tesfaye
29a695b0c7 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: I1f2cbcfe67614dbf8a9dba475f9a126cd25626b0
2021-05-14 16:14:03 +00:00
Abel Tesfaye
c045fb64e6 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: Idf4555fc69ce3789881932482d701346a8935536
2021-05-14 16:12:22 +00:00
Abel Tesfaye
069ec27db1 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: I0b1735f1393da95df9576db11ecb22086b0d08ed
2021-05-14 16:12:21 +00:00
Abel Tesfaye
c077b490f4 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev 2021-05-14 15:55:01 +00:00
ykhung
1ec8f04feb Add battery usage metric
Bug: 188046672
Test: make SettingsRoboTests
Change-Id: I1716913eee7c93cafd622052dcbca940c9726a17
2021-05-14 14:18:55 +00:00
Arc Wang
a3c6cd1cdd Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 am: 5e0461e3a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: Ic1e1cb8d350b6f09cf5a50781177311c08107740
2021-05-14 13:28:35 +00:00
Arc Wang
5bbdc3b5b9 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2 am: 4418d9a31a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I99d381076cdcec75f1a5f35f79374e3222af4b1c
2021-05-14 13:28:22 +00:00
Arc Wang
5e0461e3a2 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: I51af4157dad68a5d2bcb4c5b521d59f9b0e3e265
2021-05-14 13:15:33 +00:00
Arc Wang
4418d9a31a Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I7acf8e2ae01291aab9ab5b603a608a70e9635010
2021-05-14 13:15:29 +00:00
Arc Wang
a486f770a6 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: I0665220f32173de9c21b1a3c79d20d60b48a85a7
2021-05-14 13:13:42 +00:00
Arc Wang
17b52da448 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I52c854da8e487abb439d242730dd81994f94a16a
2021-05-14 13:13:34 +00:00
Arc Wang
6ea0e686ea Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: Id63db4ce7e78e1ad807b6851a7e4876f22794303
2021-05-14 13:11:25 +00:00
Arc Wang
2ff4ef036d Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I204240c34d06f4d86175deebe5a793f51b6d767a
2021-05-14 13:11:11 +00:00
Arc Wang
c0d31a80d3 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev 2021-05-14 12:59:11 +00:00
Arc Wang
20d45cc6f2 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev 2021-05-14 12:58:36 +00:00
Jan Tomljanovic
e6070f9f0e Filter out SecuritySettings search results when alternative available.
When alternative fragment is shown for the security settings page, we
don't want to show search results that would lead to an unused security
settings page.

Test: manual
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests -j
Bug: 184613149
Change-Id: I525bd87d1ac6a24a7a26f59ae917e35ac39732e3
2021-05-14 11:52:12 +01:00
TreeHugger Robot
e0ec97aa7b Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: I2a7e8610bf08ecc04bb6b8c074c65f4e553bb2d1
2021-05-14 10:26:10 +00:00
TreeHugger Robot
152f48f839 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054 am: 918af6c6a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: Ic2bb5ab8562c6559effaebe1799354d7f46bf7ce
2021-05-14 10:25:31 +00:00
YUKAI HUNG
3fecf1fb17 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3 am: e1d946b9ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: I15a3ec4a2341f1baf0b226ee09cf10ca2e116a11
2021-05-14 10:25:21 +00:00
TreeHugger Robot
60f5f85774 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: If952f0d808233d1a28e4c87694242264f9bb0506
2021-05-14 10:24:05 +00:00
TreeHugger Robot
918af6c6a9 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: Ic4d79121d3dff25131d9cc1069c3a718721d2bcd
2021-05-14 10:20:00 +00:00
YUKAI HUNG
e1d946b9ec Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: I8597c0a87704f4ffc5e6051d586cddc75356a12c
2021-05-14 10:19:55 +00:00
TreeHugger Robot
5af530a054 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev 2021-05-14 10:18:46 +00:00
YUKAI HUNG
0af80557f5 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: I796b670e161b2aecadf7fd9467ca31658226a1c1
2021-05-14 10:15:38 +00:00
YUKAI HUNG
c5f6e92939 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: I79477e2003f7cf43d9b1bf61f5851f16d044d349
2021-05-14 10:15:25 +00:00
YUKAI HUNG
abd364e1f3 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev 2021-05-14 10:11:28 +00:00
TreeHugger Robot
c48f7caed4 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0 am: cb5bfc0d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: Ie0f75865eff3429d97b8b407b528ca0e77e2a062
2021-05-14 10:11:03 +00:00
TreeHugger Robot
431b7b06ad Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261 am: 99553c187e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I661574b1c88e542877b670b97c0ff93b44c19afe
2021-05-14 10:10:58 +00:00
TreeHugger Robot
cb5bfc0d77 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: Ic5ae7d5ed271cf6dbb2341be8a8fb1f38a858b43
2021-05-14 10:05:24 +00:00
TreeHugger Robot
99553c187e Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I48ca62c820b0cd49b89a07a32c474007964a4671
2021-05-14 10:05:02 +00:00
TreeHugger Robot
0b246618f0 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2 am: 7dada139f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: Id3e428722c57c5cc26a01b768c3165c1126c65ac
2021-05-14 10:04:39 +00:00
Chiachang Wang
27130d5ce9 Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465 am: e5d4adc69e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

Change-Id: I1ec067ca7807a25adcb03287cafe1b4b4210b23a
2021-05-14 10:03:41 +00:00
TreeHugger Robot
3fc655482f Merge "Wrap generating battery history keys into another method" into sc-dev am: 5c2a472b39 am: 9fce90e953
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542665

Change-Id: I9ede2d99ee515f1293af067496fc1695824b50ed
2021-05-14 10:03:28 +00:00
Stanley Wang
5d6410dbd6 Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2 am: 96431d2f81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: I57253a85e254a07856ebe4d799cc09a6259c1f49
2021-05-14 10:03:22 +00:00
TreeHugger Robot
ddc25f4d59 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: I300cff11f9e2a503c3e05788a9de9c5e2cab67bc
2021-05-14 10:03:18 +00:00
TreeHugger Robot
c62398d25b Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: Icc1f6337114d35e1fc8e4eb1f8573a9cfec1ca79
2021-05-14 10:03:10 +00:00
TreeHugger Robot
f23409f7e5 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: Ie28332bef31c7671d6b794c7d82c8958f788d66a
2021-05-14 10:02:29 +00:00
TreeHugger Robot
66fa924dfa Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I7ad2e5dabc09d026665bc532da83a8fa7bd2fba6
2021-05-14 10:02:23 +00:00
TreeHugger Robot
0174c4bad0 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev 2021-05-14 09:59:54 +00:00
TreeHugger Robot
7c50995261 Merge "Fix foreground Service background launch restriction" into sc-dev 2021-05-14 09:54:12 +00:00
Yanting Yang
be4c5f078f Remove silky flag from homepage for official release
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: I9259108534935ed8551748b922098dd52043afc1
2021-05-14 17:52:53 +08:00
TreeHugger Robot
7dada139f5 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: I8e73e48e79036bb16405fab8d7199bb86bcdb4a5
2021-05-14 09:38:42 +00:00