Commit Graph

111108 Commits

Author SHA1 Message Date
Hank Sheng
349b36bb91 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id2d1766f508dd02f8412131c25f12f82d92a3833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:03 +00:00
SongFerng Wang
fc01fb0302 Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec am: 1ab90f4640
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

Change-Id: Id9745becd41d7b74946bc57d07402e7c503dd9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:01 +00:00
Chaohui Wang
f9bfc59281 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: 4bcaccf8d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I1333dc9c30937b37a397138e69147e1b88286fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:48:01 +00:00
Chaohui Wang
dd2e6e88c6 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4 am: 0580fb0d67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Id82a3df97f16a5e10baf96cf636888a57405e1d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:47:28 +00:00
Hank Sheng
912366df5a Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: I8574008d24b8fb522fe975565ef1f14023306cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:47:06 +00:00
Hank Sheng
0c8e9b6510 Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898

Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:46:43 +00:00
Hank Sheng
3dfcc708aa Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev 2022-05-27 05:32:47 +00:00
SongFerng Wang
1ab90f4640 Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598

Change-Id: I308ab424ad1acf881c0106de1007393e7bf0bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:32:46 +00:00
Chaohui Wang
caabb4fe49 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: I348919ec56e2f4ba3a28db987b205cddeb44463a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:26:26 +00:00
Chaohui Wang
4bcaccf8d3 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Ic1dcc095cf52be3495a4d4863d27fed25157c068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:24:54 +00:00
Chaohui Wang
0580fb0d67 Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945

Change-Id: Ie0f17561fa78044cf1dedf24f49d4b7123c4b068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 05:24:53 +00:00
SongFerng Wang
ed0f3c60ec Merge "Settings: Change array resource sim_color_light to an integer array" 2022-05-27 05:12:32 +00:00
Chaohui Wang
bc2e0f5fc4 Merge "Fix unable to toggle off Pause app activity" into tm-dev 2022-05-27 04:59:46 +00:00
changbetty
012527b81c Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
Merged-In: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
2022-05-27 04:05:44 +00:00
Chaohui Wang
c2dacf1b75 Fix flicker for AppDataUsage when zero usage
When the page is entered from the AppInfoDashboardFragment, there is no
way to know whether the cycle data is available before finished the
async loading. If it's zero usage, the cycle spinner will be removed,
which cause a flicker.

Temporarily disable the preference list's animator before initial
page updates can solve this issue.

This also fix another flicker on this page when the background data is
off.

Fix: 233963355
Test: manual visual test
Change-Id: I795ed95e15bb3216fa17adfd4f57faf5fd92fa00
2022-05-27 10:21:17 +08:00
Bill Yi
ff457d8594 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib80c2408db28e4aa45a04109220fc2419fa82a5b
2022-05-26 18:27:20 -07:00
Bill Yi
4fcb08305a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3fa9ddd1fa5829250d7c4fe695278c383c5c91ea
2022-05-26 18:23:46 -07:00
Bill Yi
691a40febf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0bd127ef78f1a645fa229cf1c55e26039ff2e58b
2022-05-26 18:20:56 -07:00
Bill Yi
a57110676f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7180d50bbb0647e8901d834cda9df4379873017
2022-05-26 18:17:25 -07:00
Amy Hsu
9f2615641f Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 2897d2fa42 am: f120b2ef67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I5897829d9d3304a059e1396c3360a0a8c2be7f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 01:16:45 +00:00
Amy Hsu
e7c009fa8e Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 7af580d08b am: bfaf38ccb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: Ic4fc275bc7bf813a88fb6562fe0600b08c60f345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 01:16:25 +00:00
Amy Hsu
f120b2ef67 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 2897d2fa42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I8835f94dceded1d6f17131264e8555fe7bf684f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:53:41 +00:00
Amy Hsu
bfaf38ccb9 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820 am: 7af580d08b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I8baddc41e02614de807e48614c06d6d862cf6dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:53:24 +00:00
Amy Hsu
2897d2fa42 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: Id18e737daee4dd59b79662ac1b23ca114e0af275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:39:20 +00:00
Amy Hsu
7af580d08b Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: eca20b0820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603826

Change-Id: I74384b25ead713af83acc06434d57ae3214739fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 00:39:16 +00:00
Amy Hsu
eca20b0820 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-05-27 00:17:19 +00:00
Lin Yuan
fcae147f58 Fix: policy enforcement for location wifi scanning
Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and
bluetooth scanning settings for location services.

screenshots: http://shortn/_EUOdqrOcnS, http://shortn/_j320QDm1Zo

Bug: 228315522
Bug: 228315529
Test: atest SettingsRoboTests, on device

Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41
2022-05-26 19:38:07 -04:00
Tom Hsu
2a8ee8005b Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 am: 1db2f02c9e am: 7b0a3f2080
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Id20940ae94c871e13066769b96c25161e54f422d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:14:49 +00:00
Tom Hsu
ac755c2ee0 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 448ca95a7a am: 8feed45265
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I994fae4155c101c1fab7c5d7a8a3d29abcc6b17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:14:40 +00:00
Tom Hsu
05774d7d17 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814 am: c421f73232
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I128d5a757c37f225ee7b3a4362b2ec9beea65fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:12:55 +00:00
Tom Hsu
7b0a3f2080 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90 am: 1db2f02c9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Icd797bfb567df5c5be7627ccdfaf6c1928cd8c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:40:57 +00:00
Tom Hsu
8feed45265 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 448ca95a7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I59a3c4f57061b1395e24be2057747db67a59b5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:39:35 +00:00
Tom Hsu
c421f73232 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e am: 019d251814
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I73a3179f80439761e4af8e1b637d7d9b4341e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:39:20 +00:00
Tom Hsu
c6b8c119d9 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: b7643967fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I2ea2d9841210c250215b521639f200d8a46692b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:18:37 +00:00
Tom Hsu
1db2f02c9e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 90875efc90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I045ded0a1212e4baf53f4fd5577d072e70798387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:08:58 +00:00
Tom Hsu
448ca95a7a Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I5c427bb1620b6f31657524c944c0ab01fc33452a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:39 +00:00
Tom Hsu
019d251814 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3 am: 806582197e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I16eef92f8fca756292ebade85c71601ac273bff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:36 +00:00
Tom Hsu
806582197e Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:41:44 +00:00
Tom Hsu
b7643967fd Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: Icf98100ffd11b54cfd7a2c3ce62273c9f62a21f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:40:36 +00:00
Tom Hsu
90875efc90 Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834

Change-Id: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:40:10 +00:00
Bill Yi
753ec22555 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526 -s ours am: 4a3e1660a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6e8c0b5ec42d386527074c421d2533b0c2a1b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:28:55 +00:00
Bill Yi
9dc0b9f669 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543 -s ours am: 35d85132c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia02ac03a23d748ccdaf27d1f8d7e4a9ae82ef879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:28:49 +00:00
Bill Yi
543d507143 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a -s ours am: 13f2373302 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I535af30839a5356138e85dc786c01658015b214c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:28:34 +00:00
Bill Yi
16526176ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb -s ours am: 258eb6ddd7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5585cb2a53c3f261798c706ec9fc2f085fed8dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:28:20 +00:00
TreeHugger Robot
c0fd8ddb35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 0788d46661 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I770d88c667b7dae2bb0bfcf763a6bcff8724391b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:18:14 +00:00
Bill Yi
4dcf0ac994 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d618eb19e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cd128f333f62fb7dd50a065815347d926357de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:18:00 +00:00
TreeHugger Robot
2eb9ac093a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5e25fcdb1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03883cfaa270188c1495c06c9520f257f59ec865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:17:55 +00:00
Bill Yi
e8c6bbdb1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d7786f8b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I680c55a96d66bd3fbf21f178c573bba717b66ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:17:47 +00:00
Tom Hsu
f6ea9c99b3 Merge "Fix wrong summary string show on the network page." into tm-dev 2022-05-26 15:06:00 +00:00
Chaohui Wang
408713b0ae Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524 am: 9cdc977bd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672

Change-Id: Iac68b15d5e00df4b33428694753952379ba86e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 14:05:31 +00:00