Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,452 Commits 1 Branch 0 Tags
01f5ecdb4dc309011d6d6ca4e79da29aa9f1a673
Commit Graph

100452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
01f5ecdb4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd3b6d272a62082e2cd40e715cb20704f1ba625
 2022-03-03 09:55:56 +00:00
TreeHugger Robot
8f84e7a9e7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:26:19 +00:00
TreeHugger Robot
76d6cbc7b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 09:15:36 +00:00
TreeHugger Robot
088bb2a3bc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 08:49:36 +00:00
Bill Yi
a93e2d89ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0f44230c35fa3d1c41246ef929b3e188cf084c1
 2022-03-03 08:38:53 +00:00
Bill Yi
657ad4c091 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I745a4ed776a72df02df79b29427f5a26f24573f2
 2022-03-03 07:45:09 +00:00
YK Hung
c08c6c5c16 Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev 2022-03-03 02:12:27 +00:00
Kweku Adams
4a21c60862 Merge "Indicate min allowed bucket." into tm-dev 2022-03-02 17:55:45 +00:00
ykhung
069df8dcb0 Fix the broken tests on BatteryTipDialogFragmentTest 
Test: make -j56 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Bug: 222229402
Change-Id: I9a6a8b69a1ef5c64bf8ce8807f83bac09f29ba8d
 2022-03-02 16:55:55 +00:00
Bill Yi
ad345144ed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68916107f4991d2ce5ee11a25c5f69f1e49390a7
 2022-03-02 16:31:58 +00:00
Bill Yi
0bfea8be54 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 
Blank merge reason: parent was merged -s ours

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

Change-Id: I95ac79be218c732c3655f7f5bae950b534ec0809
 2022-03-02 16:25:05 +00:00
Bill Yi
651ff7ece6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 
Blank merge reason: commit message contains skip directive

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

Change-Id: I6024ef9c60c715a2bd283a73e9f40b86803c85ae
 2022-03-02 16:24:58 +00:00
Bill Yi
2ba7f57217 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If35ec49c403221a9c6079cf4b4e60ffddbfd5f2e
 2022-03-02 16:24:43 +00:00
Bill Yi
0a5c4fc117 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2697d0b7917b58159e9c81382931c0555babe1e7
 2022-03-02 16:20:36 +00:00
Bill Yi
48fce57d2c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I06944e12a02a336cefab0ca6a720fb6bcc3c5726
 2022-03-02 16:08:19 +00:00
Bill Yi
11683d653b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibb99c8c427c1bd2e4338fd2301568e4ce63a5b1e
 2022-03-02 16:04:10 +00:00
Beverly Tai
b2baaebb8a Merge "Don't show the "When to show" PreferenceCategory" into tm-dev 2022-03-02 13:14:14 +00:00
Tom Hsu
d626cb16f8 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f am: 293571f054 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: Ib7b1d25aa8ff2e1f172eebf148790873cc292ded
 2022-03-02 12:42:33 +00:00
Tom Hsu
293571f054 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: I874e3e478ce29dda24860a2e007279bf7ca77c47
 2022-03-02 12:19:56 +00:00
Tom Hsu
0e8aed527f Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

Change-Id: I5de3906942beb7efe557e3491468f91f9d67db48
 2022-03-02 11:59:46 +00:00
Tom Hsu
d915b09e21 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." 2022-03-02 11:28:50 +00:00
TreeHugger Robot
9e9a39d717 Merge "Cache mechanism for Storage page with work profile" into tm-dev 2022-03-02 09:49:42 +00:00
Arc Wang
f74e1195a4 Merge "Only show 2-pane deep link when homepage is available" into tm-dev 2022-03-02 07:20:00 +00:00
Tsung-Mao Fang
88bff1ebc5 Merge "Fix unable to scroll to the bottom page" into tm-dev 2022-03-02 03:13:01 +00:00
Edgar Wang
ab22c72319 Merge "Update workprofile TabLayout for Material Next style" into tm-dev 2022-03-02 02:28:03 +00:00
Arc Wang
9ba80e76b3 Only show 2-pane deep link when homepage is available 
DeepLinkHomepageActivity is disabled by default and may be
enabled after receiving the PRE_BOOT_COMPLETED broadcast.

On some virtual devices, DeepLinkHomepageActivity may not
be enabled for test cases. This is a fallback option to
show a full screen Activity to pass tests.

Bug: 221149428
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I4bbe785176fe3fe8831484141aff7367e4ca25ce
 2022-03-02 01:24:14 +00:00
Colin Cross
54a9fd4e17 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: I6e850608c5454ce80562a956074bc9ebe5c1597d
 2022-03-02 00:55:39 +00:00
Colin Cross
f21625fe80 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If16d05bf70b7802cfc0aaf917949b62231147058
 2022-03-02 00:34:33 +00:00
Colin Cross
e23884eed9 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796
 2022-03-02 00:13:00 +00:00
Colin Cross
9c59242102 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" 2022-03-02 00:01:05 +00:00
Adam Bookatz
f886179845 Merge "Fallback Home doesn't restart on keyboard change" into tm-dev 2022-03-01 22:51:27 +00:00
Edgar Wang
f97f5f7005 Update workprofile TabLayout for Material Next style 
1. Upgrade ViewPager to ViewPager2 which provided better support.
2. Apply new TabLayout style

Bug: 193249384
Bug: 195655281
Bug: 193249173
Bug: 179738624

Test: manual

Change-Id: I905ee82f315316c2bf4b73bf5581423878e2c3e7
 2022-03-01 18:07:43 +00:00
Evan Laird
90aabce9b4 [automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb -s ours am: 3a46e06c41 -s ours 
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c is already in history

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

Change-Id: Ia3919d432c81dced9012c556b9c1dacd393725a2
 2022-03-01 17:05:36 +00:00
Yuri Ufimtsev
abc541d56d Merge "Provide data for BiometricsSafetySource" into tm-dev 2022-03-01 16:52:46 +00:00
Yuri Ufimtsev
530e967ac4 Merge "Add warning card for Safety Center when no screen lock is set" into tm-dev 2022-03-01 16:49:54 +00:00
Evan Laird
3a46e06c41 [automerger skipped] Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev am: 15a87a86bb -s ours 
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 16148d2c8c is already in history

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

Change-Id: I540666b2e72f0b6d63980e63fe0f39afa2d464bf
 2022-03-01 16:41:05 +00:00
Evan Laird
9aba5cfec7 [automerger skipped] Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp am: 39c4d8b827 -s ours 
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf6a is already in history

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

Change-Id: Ic65720729a0e09d76ea934a5b89ffbfcd53f5000
 2022-03-01 16:35:33 +00:00
Presubmit Automerger Backend
cf59b35348 [automerger skipped] [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c am: 0b843be422 -s ours 
am skip reason: Merged-In I2d389d71dd9402353b058039464495a1d33ef0e9 with SHA-1 4871b2cf6a is already in history

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

Change-Id: I0bd94051649ada1d7bbe832592892808182966c5
 2022-03-01 16:35:29 +00:00
Jan Tomljanovic
66a3b3a927 Merge changes from topics "facesettingchange", "presubmit-am-1a8eb017a271444b896f19197b617d62" into tm-dev 
* changes:
  Trigger SafetyCenter update on each Face setting change.
  Trigger SafetyCenter update on each Fingerprint settting change.
 2022-03-01 16:21:38 +00:00
Evan Laird
15a87a86bb Merge "Add setting for showing the vibrate icon in status bar" into sc-v2-dev 2022-03-01 16:19:47 +00:00
Evan Laird
39c4d8b827 Merge changes from topic "vibrate-setting" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] Add setting for showing the vibrate icon in status bar 2p: 16148d2c8c
  Add setting for showing the vibrate icon in status bar
 2022-03-01 16:19:47 +00:00
Yuri Ufimtsev
6cadee43e5 Add warning card for Safety Center when no screen lock is set 
Test: atest SettingsUnitTests

Bug: 218868097
Change-Id: I4cbc50559dd1d32b5b916a19f7d0b2b27d67510d
 2022-03-01 15:52:56 +00:00
Beverly
81da0689ec Don't show the "When to show" PreferenceCategory 
If the ambient display isn't available. This includes
AOD wakeup gestures.

Test: manual
Fixes: 195413949
Change-Id: Ief1876e231288274a35db2fb185ac92864450d48
 2022-03-01 14:50:07 +00:00
Julia Reynolds
40caac3c9e Merge "Disable app toggle for some T+ apps" into tm-dev 2022-03-01 13:42:26 +00:00
Tsung-Mao Fang
32c1fc76d8 Fix unable to scroll to the bottom page 
We should set padding for root view instead of margin.

Test: Verify the behavior is correct in single pane
and two panes mode.
Fix: 221422906

Change-Id: I17a63be6e536ffcf39744b2e98dc1ea2723ebf1d
 2022-03-01 11:51:03 +00:00
tom hsu
427906c29e [Tetheirng] Show a dialog indicate tethering is unsupported by carrier. 
Bug: 161206517
Test: manual
Change-Id: I45a2e42367850ab6fc901fe508671677d843b793
 2022-03-01 18:10:10 +08:00
Tsung-Mao Fang
c0c6944e95 Merge "Make homepage search bar remain persistent when scrolling" into tm-dev 2022-03-01 08:30:38 +00:00
Jason Chiu
bcfd5b3d65 Make homepage search bar remain persistent when scrolling 
- Modify the scroll flag
- Add a background to avoid overlapping

Fix: 218825541
Test: visual
Change-Id: Ice88c1bb324780e72332dd810e654b1d17daafae
Merged-in: Ice88c1bb324780e72332dd810e654b1d17daafae
(cherry picked from commit 7cf0819b41)
 2022-03-01 07:30:08 +00:00
Marie Matheson
1a2adf5115 Merge "On Settings lockscreen changes send new safety status to Safety Center." into tm-dev 2022-03-01 07:18:02 +00:00
Tsung-Mao Fang
27bef200be Merge "Media permission update for Android T" into tm-dev 2022-03-01 03:27:00 +00:00