Commit Graph

80997 Commits

Author SHA1 Message Date
Edward Cunningham
b1bb4daeec Merge "Improve installer attribution in App Info." into sc-dev am: aacf7bd6f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13872508

Change-Id: I31e7a4b6b7448c884ed2ee6d1d80fdf500e195b5
2021-04-02 17:10:14 +00:00
Edward Cunningham
aacf7bd6f0 Merge "Improve installer attribution in App Info." into sc-dev 2021-04-02 16:44:03 +00:00
Julia Reynolds
420f5d4d59 Merge "Fix incorrect title" into sc-dev am: 990b405edb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14075639

Change-Id: I534b7858313d7f1e41a0fc4a33167a9182aaee28
2021-04-02 16:28:07 +00:00
Julia Reynolds
990b405edb Merge "Fix incorrect title" into sc-dev 2021-04-02 15:53:11 +00:00
Julia Reynolds
6c427a181f Fix incorrect title
Test: view screen after rotating device
Fixes: 182171355
Change-Id: If4cb2a9495bd9e59a586f64377ca05e3b01bfbe2
2021-04-02 10:14:19 -04:00
Edward Cunningham
faf44124ba Improve installer attribution in App Info.
When an app is installed by the Package Installer app on behalf of
another app (eg. a browser, file manager or app store that opens an APK
via an activity start), it is preferable to attribute the install to the
originating app rather than the 'Package Installer' itself.

Since Android R, package manager keeps track of the necessary install
source information which enables this more precise attribution. If an
originating package is recorded and was set by a system app, we use this
as the user-visible 'installer'.

Bug: 182365285
Test: make RunSettingsRoboTests
Change-Id: Ibb329d6fe8f0fa2ad51d3530a219b2d8b8d6c17b
2021-04-02 12:45:43 +01:00
TreeHugger Robot
cadf08da4e Merge "Fix BatteryInfo test fail" into sc-dev am: a0ada5af53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065248

Change-Id: Ia80a4c9bc67566a44b40f537a4e3ac7bf928d319
2021-04-02 04:02:35 +00:00
TreeHugger Robot
a0ada5af53 Merge "Fix BatteryInfo test fail" into sc-dev 2021-04-02 03:25:07 +00:00
Yi-an Chen
b93fd515ad Merge "Add top level privacy hub preference" into sc-dev am: 9724bd9e0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14054525

Change-Id: I68a3b6c69487b07f81374c7c63c186a7de7af278
2021-04-01 20:34:15 +00:00
Yi-an Chen
9724bd9e0c Merge "Add top level privacy hub preference" into sc-dev 2021-04-01 19:56:16 +00:00
Adam Bookatz
292c0c8d11 Merge "Failed guest creation doesn't crash Settings" into sc-dev am: a01c223fb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056992

Change-Id: I51173787eb436419d04ec6d094f0730fbfa4541d
2021-04-01 19:31:35 +00:00
TreeHugger Robot
34a063b739 Merge "Don't always change username when adding account" into sc-dev am: 5e98a92fe8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056085

Change-Id: I785bbc7b7dede1cd6d6ce9930d48d343570c9b5c
2021-04-01 19:30:05 +00:00
Adam Bookatz
a01c223fb8 Merge "Failed guest creation doesn't crash Settings" into sc-dev 2021-04-01 19:26:51 +00:00
TreeHugger Robot
5e98a92fe8 Merge "Don't always change username when adding account" into sc-dev 2021-04-01 18:47:20 +00:00
TreeHugger Robot
97c50e681a [automerger skipped] Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d am: d86780ddc1 -s ours am: ef3ee12a59 -s ours
am skip reason: skip tag Change-Id I98d9a93bfdc792017124dda52a59d25a6462079e with SHA-1 4f6caf2941 is already in history

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

Change-Id: Id34a2d4698c52f2c920b5d4aa8a37083df0b3b68
2021-04-01 17:25:37 +00:00
Tsung-Mao Fang
92e34391eb Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe am: d80c5bba40 am: 2f24ae2f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I43d2b977fa40acfb24c16d4fceba102d3e7fa5e7
2021-04-01 17:25:21 +00:00
Adam Bookatz
0cb47e92d4 Don't always change username when adding account
During Setup Wizard for a new user, if an account is added,
the user's name gets updated to match their account's name.
Recently, however, the user can actually type in a name before
even reaching the Setup Wizard. If they elect to do so, we shouldn't
overwrite their name with their account name, so this cl makes
sure to only use the account name if the original name wasn't
manually entered.

Bug: 171255493
Test: manual verification (create new user and enter account during
      SUW. Do both with and without entering initial user name.)
Change-Id: I443648dafc0d83a71750f7f6472bbea4e2ee23bb
2021-04-01 10:20:17 -07:00
TreeHugger Robot
ef3ee12a59 [automerger skipped] Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d am: d86780ddc1 -s ours
am skip reason: skip tag Change-Id I98d9a93bfdc792017124dda52a59d25a6462079e with SHA-1 4f6caf2941 is already in history

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

Change-Id: I01afabba8497720fed7ef9b1eb726d917db4cd6a
2021-04-01 17:09:41 +00:00
Tsung-Mao Fang
2f24ae2f5b Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe am: d80c5bba40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I4e82a29bba6442681172a99074e11e2f4d231f4f
2021-04-01 17:08:43 +00:00
Hai Shalom
11b6dadfb1 Merge "Settings: Rename OCSP Do not validate option" into sc-dev am: b7dd5e5857
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14061105

Change-Id: Ie3e120377f86607c9031fe55ce68616bbc162eae
2021-04-01 17:05:22 +00:00
Hai Shalom
b7dd5e5857 Merge "Settings: Rename OCSP Do not validate option" into sc-dev 2021-04-01 16:24:38 +00:00
TreeHugger Robot
d86780ddc1 Merge "Only display single line for title" into rvc-qpr-dev am: 9258e9ee9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060694

Change-Id: I57dda339fa89ea790092b24c71a2ac2f0c443fdc
2021-04-01 16:24:07 +00:00
Tsung-Mao Fang
d80c5bba40 Merge "Revert "Only display single line for title"" into rvc-qpr-dev am: bfb68fa6fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060688

Change-Id: I0312dc7bf253ef50a89848ae9879646200282e66
2021-04-01 16:23:51 +00:00
TreeHugger Robot
9258e9ee9d Merge "Only display single line for title" into rvc-qpr-dev 2021-04-01 16:18:08 +00:00
Beth Thibodeau
ee004b8f00 Merge "Update style of main media setting toggle" into sc-dev am: 6812256031
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13998846

Change-Id: I833ee9707b5ba624b18766ee4e8ac37a1ccad063
2021-04-01 16:05:18 +00:00
Jason Hsu
95c4073c2e Merge "Remove unused code" into sc-dev am: 4e95be4aa2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060696

Change-Id: I0e02f847a1e8b8720c3a050a96b2913c3de2829d
2021-04-01 16:05:10 +00:00
Tsung-Mao Fang
bfb68fa6fe Merge "Revert "Only display single line for title"" into rvc-qpr-dev 2021-04-01 15:56:19 +00:00
Beth Thibodeau
6812256031 Merge "Update style of main media setting toggle" into sc-dev 2021-04-01 15:47:07 +00:00
Jason Hsu
4e95be4aa2 Merge "Remove unused code" into sc-dev 2021-04-01 15:27:21 +00:00
Pavel Grafov
9bdbdad05f Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931 am: 69022ccc3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: I4924ab3bc748ffde96d2bbcd344c3b546b0abe48
2021-04-01 15:01:54 +00:00
Wesley.CW Wang
7366d71702 Fix BatteryInfo test fail
- rollback part of ag/14063746

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I11129713dac2584c54890f65af53ce76b0672b8d
2021-04-01 14:31:14 +00:00
Pavel Grafov
69022ccc3a Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp am: efab095931
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14051306

Change-Id: Iaa80f44026f969706701bfc6a4aa4317b1a8acf2
2021-04-01 14:24:46 +00:00
tim peng
8e54e9a16e Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev am: 6f96226f45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14045485

Change-Id: I28f0d5e182311fe69933593e75b4515247ddea7d
2021-04-01 14:00:27 +00:00
Pavel Grafov
efab095931 Merge "Prevent disconnecting admin-configured VPN" into rvc-qpr-dev-plus-aosp 2021-04-01 13:49:32 +00:00
tim peng
6f96226f45 Merge "[Rohan]The battery level show up "-1%", not sync with Rohan." into sc-dev 2021-04-01 13:25:31 +00:00
Wesley Wang
7180fcfa4e Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev am: e949d0f870
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063746

Change-Id: I0b86e1a12017e1025a9f0b513aef5ad1b6a00b61
2021-04-01 12:14:45 +00:00
Wesley Wang
e949d0f870 Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev 2021-04-01 11:30:22 +00:00
Wesley.CW Wang
d7e0fa959b Fix testing fail for BatteryInfoTest and HighUsageTipTest
- Fix the test fail from ag/14048547

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: Ia7a0d0fa567b1826a42b304a04e627e3b0e5f896
2021-04-01 18:28:14 +08:00
Jason Hsu
3b50fa0a9e Merge "Update accessibility settings layout" into sc-dev am: 849055967f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056751

Change-Id: Idd91938fae54d4e16abcb4a2e2396d2a51413ffc
2021-04-01 10:27:25 +00:00
jasonwshsu
6e33293fa3 Remove unused code
* isColorTransformAccelerated() already moved to ColorDisplayManager
* TurnScreenDarker fragment already moved to top level accessibility settings or TextAndDisplay fragment

Bug: 174829936
Test: manual test
Change-Id: I34ec6947129a5042d573e94eabe3c24c2fe761b5
2021-04-01 09:41:11 +00:00
Jason Hsu
849055967f Merge "Update accessibility settings layout" into sc-dev 2021-04-01 09:40:32 +00:00
Tsung-Mao Fang
46cd45a50f Merge "Only display single line for title" into sc-dev am: 6d0ed92049
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060693

Change-Id: Ibae8e463e946b819dccd5e702ec4caaf1ee44829
2021-04-01 08:00:31 +00:00
Tsung-Mao Fang
6d0ed92049 Merge "Only display single line for title" into sc-dev 2021-04-01 07:41:55 +00:00
Tim Peng
7246a4f842 [Rohan]The battery level show up "-1%", not sync with Rohan.
-Hide battery information when it is unknown

Bug: 184017556
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I5f94ccae364f1420e04af21ba425c29ac6a11dd2
2021-04-01 15:40:54 +08:00
YUKAI HUNG
0432960627 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev am: 971dc476c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060695

Change-Id: I0c3bda522fee87d3cc48a511f1ffaddd2784a852
2021-04-01 07:37:15 +00:00
YUKAI HUNG
971dc476c3 Merge "Fix testing fail for BatteryEntryTest from patch ag/14008232" into sc-dev 2021-04-01 07:10:22 +00:00
Wesley.CW Wang
43e371c393 Update low battery tips string am: 6d836d2d51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14048550

Change-Id: I7a86ed3ac4cb2f26ca302bf87def529d460847f9
2021-04-01 06:52:41 +00:00
Wesley.CW Wang
6d836d2d51 Update low battery tips string
- Screenshot: https://screenshot.googleplex.com/33zJkqsTex8r49W.png

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I864c555c3e500bf4ae5364db8dd6c86be564b883
2021-04-01 06:30:08 +00:00
Hugh Chen
04052e23d7 Merge "Revert "Fix bluetooth settings will broadcast to anywhere when some cases"" into sc-dev am: cf2dc5107b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14056750

Change-Id: I3bc893768abbf7905fed16945a9c24cf42bdf671
2021-04-01 06:12:54 +00:00
Tsung-Mao Fang
f7ae52bed6 Only display single line for title
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.

Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
2021-04-01 05:48:04 +00:00