Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,310 Commits 3 Branches 0 Tags
3057504bee36264bcb9f4b75d3aaacbef62ab9d8
Commit Graph

6892 Commits

Author SHA1 Message Date
Hai Zhang
e6be16bdc0 Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev am: ab3f51955b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15225529

Change-Id: I4c106e1e5a8cc2d7285781bf3a8cc2307ae70c43
 2021-07-08 03:49:02 +00:00
Quang Luong
a6748cc7cb Merge "Show "Unavailable" when factory Wi-Fi MAC address is default" into sc-dev am: ec668aae67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15222568

Change-Id: Icee13973b41cd39b59b4eec9ef0e2786bcac1e9d
 2021-07-08 03:48:37 +00:00
Hai Zhang
ab3f51955b Merge "Fix CollapsingToolbarBaseFragment crash on R." into sc-dev 2021-07-08 03:48:27 +00:00
Quang Luong
ec668aae67 Merge "Show "Unavailable" when factory Wi-Fi MAC address is default" into sc-dev 2021-07-08 03:42:19 +00:00
Hai Zhang
24dbdd58e1 Fix CollapsingToolbarBaseFragment crash on R. 
The view with R.id.content_parent is a LinearLayout in the R layout
file, and will cause a ClassCastException on R.

Bug: 182960931
Bug: 183757373
Test: presubmit
Change-Id: I15bf8f14ac1e6b0986b040e25a2b5f57735b62a8
 2021-07-07 23:02:25 +00:00
Tomoharu Hatano
bbc1cd87e1 Show "Unavailable" when factory Wi-Fi MAC address is default 
Show "Unavailable" when factory Wi-Fi MAC address is default to align
with WifiDetailPreferenceController.

Bug: 192935640
Test: build
Change-Id: I38728410b11c0db1d922f29fc68fec6af75affe4
 2021-07-07 08:33:03 -07:00
TreeHugger Robot
1c318f60be Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-03 03:48:18 +00:00
Bill Yi
34538a99b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I00c92bad34a6f6dbfe8118af2c6b5045c333eebd
 2021-07-02 23:36:44 +00:00
Ying Xu
5466eef4c8 Merge "Disable W+ in QS." into sc-dev am: d003be9369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188979

Change-Id: Ied6c36d7b984422115be23547ea3dd7e9270b12a
 2021-07-02 21:27:47 +00:00
Ying Xu
d003be9369 Merge "Disable W+ in QS." into sc-dev 2021-07-02 21:25:23 +00:00
Mill Chen
e0e87f2ecf Merge "Update dynamic height adjusting" into sc-dev am: e665e27525 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187824

Change-Id: I96aac9546331229fd2be208eb40476c30e6f5348
 2021-07-02 19:03:08 +00:00
Mill Chen
e665e27525 Merge "Update dynamic height adjusting" into sc-dev 2021-07-02 18:48:50 +00:00
Stanley Wang
29203ba4e2 Merge "Refine the IllustrationPreference." into sc-dev am: 39ee79bd8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15151600

Change-Id: I04ec5dae821c66e54851d535ca444cae05903e53
 2021-07-02 16:36:17 +00:00
Cassie
e1ebcd303d Disable W+ in QS. 
Bug: 191903788
Test: manual
Change-Id: Id965fb6dc588a40ddbf8c594b3eeae1ef82aa10c
 2021-07-02 09:26:09 -07:00
Mill Chen
4bc5bdeb78 Update dynamic height adjusting 
The current dynamic height adjusting workaround might cause that a
flicker problem happens in the collapsing toolbar and it might cause
that the collapsing toolbar has different background colors in some
setting pages. The new Material library has already supported the
dynamic height adjusting for multi-line titles, so we will use the new
mechanism instead.

Fix: 191038325
Fix: 189896657
Test: visual verified
1) Navigate to permission pages
2) Observe the title and check if it has different background color and
is overlapping with the back arrow

Change-Id: Ib928ab628cb7838460264f704bebf5c7a2aa9a47
 2021-07-02 21:56:23 +08:00
Stanley Wang
444ddc6c90 Refine the IllustrationPreference. 
- If we set a fixed height for the illustration and automatically
  scale the width of the illustration, the size of the background
  layer will be different from the size of the illustration. To
  fix this problem, we must make the background layer the same
  size as the illustration and automatically scale.
- Update the size of background to 412x300.
- Update the layout of frame's child views to wrap_content.
- Update the padding of frame to 16dp.

Bug: 190810977
Test: robotest and see the UI

Change-Id: I0422f91c24860154fea7c766d5670c314d62bebb
 2021-07-02 16:50:39 +08:00
Chen Xu
b804a7beb2 Merge "Apply new settings widget lib for the cbr main feature switch" into sc-dev am: 5e20541fc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14791815

Change-Id: I500f17bf2589723cdbdd0b25f1d5bffa442c1f3a
 2021-07-01 18:19:02 +00:00
Chen Xu
5e20541fc9 Merge "Apply new settings widget lib for the cbr main feature switch" into sc-dev 2021-07-01 18:02:01 +00:00
TreeHugger Robot
c1b7541be4 Merge "Shows ripple inside SettingsSpinner and its dropdown items" into sc-dev am: 1f26477a0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15125792

Change-Id: Ia58b7a9540c84ca7ae0b8184c23762d997fa914e
 2021-07-01 15:01:50 +00:00
TreeHugger Robot
1f26477a0b Merge "Shows ripple inside SettingsSpinner and its dropdown items" into sc-dev 2021-07-01 14:51:27 +00:00
TreeHugger Robot
8ac7a58723 Merge "Fix Talkback say twice in MainSwitch" into sc-dev am: bf929bbd3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15167655

Change-Id: Ic8dd4a57973c03a6cbb502f17448ecfdd9992728
 2021-07-01 14:06:27 +00:00
TreeHugger Robot
bf929bbd3b Merge "Fix Talkback say twice in MainSwitch" into sc-dev 2021-07-01 13:47:10 +00:00
Sunny Shao
429d7624fb Fix Talkback say twice in MainSwitch 
- Remove the duplicated setting in the ContentDescription.

Bug: 191735947
Test: manual test
Test: make RunSettingsLibRoboTests -j ROBOTEST_FILTER=com.android.settingslib.widget
Change-Id: If28d0002dd1087173623b654c67bc7597d721a85
 2021-07-01 15:17:13 +08:00
Chen Xu
4608a7a448 Apply new settings widget lib for the cbr main feature switch 
apply the new settings widget lib for the emergency alert main feature
switch.

Bug: 183574149
Test: Manual
Change-Id: Idfdb2696056faf3dbe4ccb0061f2b61c33e94292
 2021-07-01 14:37:56 +08:00
TreeHugger Robot
7ab39fec3d Merge "Add null checker to AppBarLayout" into sc-dev am: e6168d76aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15165360

Change-Id: I7a1c6a3ec3a4f42aa81d413d45d4fc178886b101
 2021-07-01 06:11:59 +00:00
TreeHugger Robot
e6168d76aa Merge "Add null checker to AppBarLayout" into sc-dev 2021-07-01 05:58:08 +00:00
Mill Chen
5b58e6d2ae Add null checker to AppBarLayout 
Fix: 191746368
Test: run atest CellBroadcastReceiverOemUnitTests on R
Change-Id: Id8130466fd282b68137ee8d848041f8607bf80a4
 2021-07-01 12:24:57 +08:00
Stanley Wang
b5794e0fe1 Merge "Fix the problem that the title of MainsSitchPreference will be truncated." into sc-dev am: d8d35066c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126530

Change-Id: I1e0578f1e4e99726a20806bc4c282338198217cd
 2021-06-30 06:42:33 +00:00
Stanley Wang
d8d35066c1 Merge "Fix the problem that the title of MainsSitchPreference will be truncated." into sc-dev 2021-06-30 06:32:43 +00:00
Stanley Wang
85c9c3e6ad Fix the problem that the title of MainsSitchPreference will 
be truncated.

- Remove the maxLines=2 attribute.

Fix: 189921147
Test: robotest and see the UI
Change-Id: Ia62fd2f5ed1e76c9f1149e842bdae308e83fb03b
 2021-06-30 14:10:40 +08:00
Kyunglyul Hyun
4ac7a783f0 Merge "Hide non transferable routes" into sc-dev am: 88146b483b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909662

Change-Id: I595973d5819f238813643afd3f5a0e09788ee85b
 2021-06-30 05:21:37 +00:00
Kyunglyul Hyun
88146b483b Merge "Hide non transferable routes" into sc-dev 2021-06-30 05:06:54 +00:00
PETER LIANG
bb9115aa95 Merge "Extend to support the static and animated format image for IllustrationPreference." into sc-dev am: dc68f8f303 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079472

Change-Id: Ibf15a50454fd7540cd8ea0cd4ad9ab2e70d08e03
 2021-06-30 00:47:08 +00:00
PETER LIANG
dc68f8f303 Merge "Extend to support the static and animated format image for IllustrationPreference." into sc-dev 2021-06-30 00:38:20 +00:00
Edgar Wang
9f9e32e3f1 Merge "Update Switch color to improve accessibility" into sc-dev am: 4e395b9821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15127246

Change-Id: I4cee3fad469aefbf069bd074dd1258fc9acdaa6d
 2021-06-29 20:15:53 +00:00
Edgar Wang
4e395b9821 Merge "Update Switch color to improve accessibility" into sc-dev 2021-06-29 20:12:45 +00:00
TreeHugger Robot
484dfe31c2 Merge "Start the web help page in the correct user" into sc-dev am: a8fd69468a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110194

Change-Id: I32f67bf4a0c1a76b26fe3388f7fc11e0ace54ca9
 2021-06-29 19:07:51 +00:00
Kevin Chyn
180ed62ff6 Merge "Update intent for requesting parental consent" into sc-dev am: 1798ddbcd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132460

Change-Id: Ie425a34ebda0c67ec881679b08cca6486abdecea
 2021-06-29 19:03:31 +00:00
TreeHugger Robot
a8fd69468a Merge "Start the web help page in the correct user" into sc-dev 2021-06-29 18:55:24 +00:00
Kevin Chyn
1798ddbcd6 Merge "Update intent for requesting parental consent" into sc-dev 2021-06-29 18:42:07 +00:00
Edgar Wang
f8aa253748 Update Switch color to improve accessibility 
Bug: 189386136
Test: visual
Change-Id: I394b42d894efb5733c224ab35ed3a11fe9f0cad8
 2021-06-29 17:58:18 +00:00
arangelov
c7c113d4df Start the web help page in the correct user 
Test: ManagedDeviceActionDisabledByAdminControllerTest
Test: manually observed the policy transparency dialog
with launching the admin policies screen
Test: manually observed the policy transparency dialog
with launching the web help page
Fixes: 191727929

Change-Id: I03aaf2ddbaff3ea515404b257d1590c08ae3ab65
 2021-06-29 14:56:54 +01:00
Stanley Wang
8e2b9c4d4d Merge "Fix the problem that the unknown item will be announced when using Switch Access." into sc-dev am: a46e16bdf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15109466

Change-Id: Ied5e01cde56969c26e7dc6fb798a3771cb24154a
 2021-06-29 07:16:22 +00:00
Peter_Liang
a6635f42e9 Extend to support the static and animated format image for IllustrationPreference. 
Actions:
1) Migrate and deprecate the widget AnimatedImagePreference
into SettingsLib IllustrationPreference. It would extend
to support the static (e.g., svg, png), animated (e.g., gif)
and lottie format image.
2) Create setImageUri() for IllustrationPreference.
3) Create setImageDrawable() for IllustrationPreference.

Bug: 190585192
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=com.android.settingslib.widget.IllustrationPreferenceTest
Change-Id: Iad5bc6af78cca4d57cb56eec104ef2384da7be9f
 2021-06-29 15:14:42 +08:00
Stanley Wang
a46e16bdf1 Merge "Fix the problem that the unknown item will be announced when using Switch Access." into sc-dev 2021-06-29 07:01:15 +00:00
Arc Wang
8814a0d560 Shows ripple inside SettingsSpinner and its dropdown items 
Bug: 187142293
Test: manual visual
Change-Id: I27190bf619bc3c35bee4c17f3e217c7d16cd7799
 2021-06-29 09:43:28 +08:00
Kevin Chyn
a6f387423f Update intent for requesting parental consent 
Bug: 188847063
Test: adb shell settings put secure android.hardware.biometrics.ParentalControlsUtilsInternal.always_require_consent 1
      settings > security > fingerprint
      press positive button
      adb logcat -b events (intent is sent)
Change-Id: I72ab71d0dd53f66387e5c2ade510ef19c2b7f4e6
 2021-06-28 15:42:04 -07:00
TreeHugger Robot
f8d2743dd5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-28 19:47:40 +00:00
Mill Chen
e5dfabf5e6 Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: f639c4ebe4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15126412

Change-Id: I8f8d027f966616dd7746067a453eeb9f7fa32db9
 2021-06-28 17:50:50 +00:00
Bill Yi
4f3b625872 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iab58c6cbc1a6daaa69846f7bc8a8e6cc7f0f2d65
 2021-06-28 17:41:56 +00:00