PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,776 Commits 1 Branch 0 Tags
613a20b60bac4bf1de5956f5097ba03fde344ae6
Commit Graph

100776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kweku Adams
49de547d55 Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862 am: c5d5358852 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518

Change-Id: I9e75f4bba5b0166e20138f64d6783efe89c1172a
 2022-03-02 18:28:41 +00:00
Kweku Adams
fae96341ad Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518

Change-Id: I5bf8224ff0979f64c5e531462ab03e161dca52df
 2022-03-02 18:06:32 +00:00
Kweku Adams
c5d5358852 Merge "Indicate min allowed bucket." into tm-dev am: 4a21c60862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17034518

Change-Id: Ibaf91b0f7e54174222f080410e1a1b7377661258
 2022-03-02 18:05:26 +00:00
Amy Hsu
b7b6ed91cf Add ScreenResolutionController to Settings app 
Settings for resolution switch

Bug: b/199559703
Test: Check resolution switch UI in Settings app
      atest SettingsUnitTests:ScreenResolutionControllerTest
      atest SettingsUnitTests:ScreenResolutionFragmentTest

Change-Id: I46d3be3b82ca512b8672efaa489df2cdaab26d6d
 2022-03-03 01:56:00 +08: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
a9e8ee6e40 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id83f405b8b044af0e5fd33278109d7a656b9ecc1
 2022-03-02 16:28:16 +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
f9c1013a35 Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a am: 7fa5f43666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663

Change-Id: I005cd7fe90cbf2d69d31d35e23f1a92ca47a4af8
 2022-03-02 13:59:35 +00:00
Beverly Tai
690bce0c9a Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663

Change-Id: I6f00e55fadccf302a3a9893ed6bf5e3a12b62bea
 2022-03-02 13:38:32 +00:00
Beverly Tai
7fa5f43666 Merge "Don't show the "When to show" PreferenceCategory" into tm-dev am: b2baaebb8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17045663

Change-Id: I07aa44ea1beb78c9687b5bc7744a7a1e88fa67d7
 2022-03-02 13:37:23 +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
f4465ae246 Merge "[Tetheirng] Show a dialog indicate tethering is unsupported by carrier." am: d915b09e21 am: 0e8aed527f am: 293571f054 am: d626cb16f8 am: 2c8008b447 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1984590

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

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

Change-Id: Iaacd7c9241e323ebb3478f745658a04d6c9b944a
 2022-03-02 12:52:24 +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
ca34582b3f [automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717 am: adab78d3ce -s ours 
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 0607c5116c is already in history

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

Change-Id: I14b2811a97f5d860d6594615b2919bca9089cf3c
 2022-03-02 10:28:46 +00:00
TreeHugger Robot
bc76e74e2d [automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717 -s ours 
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 cda892df85 is already in history

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

Change-Id: I24d0882afc3afedd0d707ebed547a7ec5e980e5c
 2022-03-02 10:06:58 +00:00
Mill Chen
3a524f2d33 [automerger skipped] Cache mechanism for Storage page with work profile am: 0607c5116c -s ours 
am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 cda892df85 is already in history

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

Change-Id: I9c30d728ea89520a77d923e6debb461ac823bf31
 2022-03-02 10:06:57 +00:00
TreeHugger Robot
adab78d3ce Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986445

Change-Id: I882442bb7b4e230294882d7d0439af16a2ae15af
 2022-03-02 10:06:12 +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
4e5cdb259f Merge "Only show 2-pane deep link when homepage is available" into tm-dev am: f74e1195a4 am: 3da67a327b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005472

Change-Id: I17fdb129a401aa1a8c5de91211b59ab1f05b06f9
 2022-03-02 08:05:08 +00:00
Arc Wang
6f5cb09bc2 Merge "Only show 2-pane deep link when homepage is available" into tm-dev am: f74e1195a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005472

Change-Id: Ic9e80fb5a0922b528221b44c3127d71a314ef87d
 2022-03-02 07:44:53 +00:00
Arc Wang
3da67a327b Merge "Only show 2-pane deep link when homepage is available" into tm-dev am: f74e1195a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17005472

Change-Id: I015e41f1d3245190b2d4a0f893fa676c2f284457
 2022-03-02 07:43: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
ab2ba44583 Merge "Fix unable to scroll to the bottom page" into tm-dev am: 88bff1ebc5 am: e582ce16c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033482

Change-Id: I052c0a18be41f19cbc571f9dd0ed11032af02367
 2022-03-02 04:01:59 +00:00
Tsung-Mao Fang
c9702a2c7a Merge "Fix unable to scroll to the bottom page" into tm-dev am: 88bff1ebc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033482

Change-Id: I6f15e4d61195240fb092cccdb117eb33bfc13c57
 2022-03-02 03:42:07 +00:00
Tsung-Mao Fang
e582ce16c7 Merge "Fix unable to scroll to the bottom page" into tm-dev am: 88bff1ebc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033482

Change-Id: Ica14a430abc91aeaa2c2647d166beb3472eff07e
 2022-03-02 03:40:47 +00:00
Edgar Wang
2e812b1331 Merge "Update workprofile TabLayout for Material Next style" into tm-dev am: ab22c72319 am: 64cb966e8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17020504

Change-Id: Ia76edef46e3ac4a64270492798f7fae39f9ac076
 2022-03-02 03:19:14 +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
752cce2f6f Merge "Update workprofile TabLayout for Material Next style" into tm-dev am: ab22c72319 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17020504

Change-Id: Ie2229daad02fab617b01278e47788dcfe7b4f8b1
 2022-03-02 02:58:18 +00:00
Edgar Wang
64cb966e8a Merge "Update workprofile TabLayout for Material Next style" into tm-dev am: ab22c72319 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17020504

Change-Id: I8331680a21997eb0de2aa34618578e6ed2c4b4ed
 2022-03-02 02:56:38 +00:00
Edgar Wang
ab22c72319 Merge "Update workprofile TabLayout for Material Next style" into tm-dev 2022-03-02 02:28:03 +00:00
Colin Cross
334746f8e6 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80 am: 54a9fd4e17 am: a80704330d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: I5f797b570ec9d3f03a8dc3684c1275f49b78f501
 2022-03-02 01:40:51 +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
a80704330d Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80 am: 54a9fd4e17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: I7fa42478632ded03fc576a87a3b48d54094c00c2
 2022-03-02 01:19:36 +00:00
Colin Cross
96971375c5 Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80 am: 54a9fd4e17 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: Ic6ad45cb22a916b93b1afff688885125ab4150c9
 2022-03-02 01:18:56 +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
Yasin Kilicdere
ae871ba823 Fix Guest string was not translated in UMS.userWithName() 
This CL reverts the changes made in ag/14282598 since the issue is
solved from the source and removes 'String name' parameter from
UM.createGuest() calls.

Bug: 185309160
Test: atest UserDetailsSettingsTest
Change-Id: I92acad938d79e21b45af99cc76ff411022b61f1b
 2022-03-02 00:03:00 +00:00