Commit Graph

84681 Commits

Author SHA1 Message Date
Yanting Yang
f94fe0e86c Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: I7058a16e5d50badbd4f18fdf7545328421475f50
2021-05-07 09:15:42 +00:00
TreeHugger Robot
4af703e2ae Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: Id40d542dcb170670037ef5dfbddadbda6d0f64ee
2021-05-07 09:14:36 +00:00
TreeHugger Robot
5e8d1554c3 Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: Iff249e22920e5e04e90920ea876b52265a6c403a
2021-05-07 09:14:12 +00:00
Yanting Yang
eecd27406c Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: Ida5e3fec18839e4ba2ce266aa5b4d2424b65ef3a
2021-05-07 09:14:08 +00:00
Yanting Yang
0f7c4495ca Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: Id45e5ee08848f83fab55acb2c56fecbc5bd491df
2021-05-07 09:14:06 +00:00
TreeHugger Robot
ac1b7661ad Merge "Turn on the transition flag" into sc-dev 2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb Merge "Add summary back to the homepage" into sc-dev 2021-05-07 09:00:32 +00:00
Syaoran Kuo
bdb5723002 Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 am: 84dfab789e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I4ee81e10bbb70dcb9a8fbf813a2f424aeac4677b
2021-05-07 08:52:49 +00:00
ykhung
4280a7f897 Refine the interpolation rule and clip the usage time data
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Syaoran Kuo
84dfab789e Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I28fa9b25ec03e5323198e81837bf266f28f2b02c
2021-05-07 08:30:50 +00:00
Syaoran Kuo
283b879e3f Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I98344c6432cbd8a2b4be4693a8296dfb031b073d
2021-05-07 08:28:46 +00:00
Syaoran Kuo
dcffe72b50 Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I884c941b0da10127ec9e05cd91d3134ad5f93b57
2021-05-07 08:28:37 +00:00
Syaoran Kuo
7dd05a8c05 Merge "Remove wifi related test." into sc-dev 2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab Remove wifi related test.
To add these case back, add a success case to avoid empty test error.

Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62 Turn on the transition flag
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
b2baeba56a Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed am: 1b2bf94780
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: Ib0a948a3325525242c9ffaa939107b3ad0688f1b
2021-05-07 05:19:38 +00:00
Edgar Wang
116b57797b Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e am: 2b301c466f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I013ca0564c44b3713752bfb8271d20f06834f6c7
2021-05-07 05:19:14 +00:00
TreeHugger Robot
e1c74cc330 Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: Iaf6750c802f825b48b40e0f539f578969a9213fd
2021-05-07 05:11:19 +00:00
TreeHugger Robot
3b72e00b7a Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: I7cc7eda7d2839b92f37d91188f4507426ba336f8
2021-05-07 05:11:14 +00:00
TreeHugger Robot
1b2bf94780 Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: I9a72d99adc6efb84a6f48df261564d802ddde25f
2021-05-07 05:06:19 +00:00
Edgar Wang
2b301c466f Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I0851b47122f67956784b36d2fd06075dd1e9f6e8
2021-05-07 05:05:57 +00:00
TreeHugger Robot
db624992ed Merge "Wallet/controls - Migrate existing settings" into sc-dev 2021-05-07 05:05:34 +00:00
Edgar Wang
78f5f98a25 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I882a9a14eccdbbf9db33f764e0db42090b62b91b
2021-05-07 05:03:51 +00:00
Edgar Wang
bd495e0413 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I873b6f6ada4e87aca2231259b5701aef940323d0
2021-05-07 05:03:51 +00:00
Edgar Wang
febe901c8e Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: If3b1222631f8ed62b4499f6be5d3a4947a86f5cf
2021-05-07 04:49:18 +00:00
Joe Bolinger
955c8349ed Prevent multi-sensor enrollment from doing nothing.
Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
2021-05-06 21:41:43 -07:00
Suprabh Shukla
ce53343669 Commit changes only when activity is closed
The consequences of revoking the permission are irreversible so delay
committing until the user navigates out of the activity.

Test: Manual

Bug: 186280600
Change-Id: Ib53496fd4e39fe15dca4aadc5bcc773d5433131c
2021-05-06 21:39:09 -07:00
TreeHugger Robot
3bfdd162a8 Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad am: 947f4d458a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I81e768c6d277bc40b831267e3d4428f21af4149d
2021-05-07 04:36:08 +00:00
Treehugger Robot
3a39be999a Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59 am: 151435a12f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: Id67f3b2620a905b0b05c696fb629afd2d1d5ec15
2021-05-07 04:34:19 +00:00
Edgar Wang
b4ada164a0 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I9e7e25716d18b62a38250d6b02c2794cc2046886
2021-05-07 04:32:55 +00:00
Edgar Wang
7106d10dd0 Merge "Add personal dictionary summary text" am: 0cbc974638
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
2021-05-07 04:18:17 +00:00
TreeHugger Robot
947f4d458a Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I173b8e677bf99e9d120604678ba1ceb79e29737c
2021-05-07 04:13:40 +00:00
Treehugger Robot
151435a12f Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: Iab3cd8d70e3e7295ffe34a40889da640e107c09c
2021-05-07 04:13:20 +00:00
TreeHugger Robot
77fe80dd73 Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I0d8290318b917d46822f6c2f2d4bc21b87fb9317
2021-05-07 04:12:17 +00:00
TreeHugger Robot
94fc21d00a Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I7c7f25049044e894725c9622d7e6c1b1dbe77fdf
2021-05-07 04:11:56 +00:00
Treehugger Robot
ca26867de4 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: Ia54fb8041f7c4ba294430bd5bda7d822f5d18e4a
2021-05-07 04:11:40 +00:00
Treehugger Robot
23c3a67321 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I3a497f119a4ba9a85db257ca78062001151e83b6
2021-05-07 04:11:33 +00:00
Edgar Wang
0cbc974638 Merge "Add personal dictionary summary text" 2021-05-07 04:02:00 +00:00
TreeHugger Robot
8642ee35ad Merge "Fix the battery usage screen left alignment issue" into sc-dev 2021-05-07 03:59:13 +00:00
TreeHugger Robot
50073054dd Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6 am: b829a124a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I72eec1ce19563110fde0d27be59165ba88748b18
2021-05-07 03:40:56 +00:00
Betty Chang
c041e2123f Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1 am: f843e9f9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413

Change-Id: I09109511859459f7f5f5b2ebc9c17d9b690265b8
2021-05-07 03:40:45 +00:00
Treehugger Robot
e24cba9b59 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: If7854bb03db1b001bb6dfd35f28f074a66b77abe
2021-05-07 03:39:34 +00:00
TreeHugger Robot
2cdb44cb6e Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052 am: ceece92af2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406

Change-Id: Ia9e1b12619f8c11909f74dfcab94e7b34d8e0329
2021-05-07 03:38:57 +00:00
Yi-Ling Chuang
377410de6d Merge existing bundle with ActivityOptions
Use Bundle.putAll() to take both the bundle passed in to the
startActivity(Intent, Bundle) and also the new created ActivityOptions
bundle, so no extra info will be lost.

Test: rebuild and add log to make sure all bundle info are kept
Bug: 187471344
Change-Id: I69c2978488f51f1c8ee705dc1bcd1bf17928fe33
2021-05-07 11:30:21 +08:00
TreeHugger Robot
b829a124a1 Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I7023186716b3eecf46a0257f937b17e4d6af8730
2021-05-07 03:13:19 +00:00
Betty Chang
f843e9f9f1 Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413

Change-Id: I307dc48903f33628b96faf04ab258c0fe1b193ec
2021-05-07 03:13:06 +00:00
Treehugger Robot
026ecdd388 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499
2021-05-07 03:11:46 +00:00
TreeHugger Robot
ceece92af2 Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406

Change-Id: Idcb68611823205243720ffcaaf51f8aa97389711
2021-05-07 03:11:25 +00:00
TreeHugger Robot
2929cdd115 Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I34041ae1c70231864a1905d545ceea383db20c65
2021-05-07 03:10:45 +00:00
TreeHugger Robot
2ec9be2d6b Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409

Change-Id: I6fd5cc40bcbfed8ccb9f2c09f7a09d5d7f8b165e
2021-05-07 03:10:41 +00:00