PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,291 Commits 1 Branch 0 Tags
2cf21dde29a81932a50f7d69674e2a5cfa12de1d
Commit Graph

51291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Zhang
2cf21dde29 Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev am: 8d9dadb1a2 
am: e458174728

Change-Id: I605957018575a9a539502a704aac7dcd59de42ae
 2019-04-10 17:51:40 -07:00
Fabian Kozynski
b27f578f03 Merge "Creates user_switcher_enabled setting to match setting" into qt-dev am: 9eef4964a4 
am: be2c2128ee

Change-Id: I329b3f3687d21921074030ea326e3eae2da9ac1b
 2019-04-10 17:50:45 -07:00
Pavel Grafov
8e02cacab9 Merge "Allow user without a password to clear credentials" into qt-dev am: 0c6ead9e61 
am: dcf6cb6fe6

Change-Id: I41fbc11373d83a7a71057f443202e38b0a220d97
 2019-04-10 17:47:48 -07:00
Antony Sargent
5cd5845752 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev am: 3b7cdfb708 
am: a6b87a24f2

Change-Id: I204f41ee8c0bbf9159879e9b7014c240a19e6ce7
 2019-04-10 17:29:32 -07:00
Fan Zhang
e458174728 Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev 
am: 8d9dadb1a2

Change-Id: I2cbabe5312fb1e0c3ddd8f8c95a842b1acfdf51a
 2019-04-10 16:52:49 -07:00
Fabian Kozynski
be2c2128ee Merge "Creates user_switcher_enabled setting to match setting" into qt-dev 
am: 9eef4964a4

Change-Id: I313114405e3e00e99c48224e680db3b026b23104
 2019-04-10 16:51:25 -07:00
Pavel Grafov
dcf6cb6fe6 Merge "Allow user without a password to clear credentials" into qt-dev 
am: 0c6ead9e61

Change-Id: Iae5bd1947f29de0f3cff3080b3a3f0fc8cf5c99c
 2019-04-10 16:49:03 -07:00
Antony Sargent
a6b87a24f2 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev 
am: 3b7cdfb708

Change-Id: I1405532c1c400a2c7d7af1397dea701bb424239a
 2019-04-10 16:19:15 -07:00
Julia Reynolds
5cc78fc802 Merge "Use correct key value" into qt-dev am: b2bf285911 
am: af2195bd98

Change-Id: Ia163053b5566950fb1cb5fec9b38b737af59e323
 2019-04-10 15:28:35 -07:00
Matthew Fritze
ec9bf86718 Merge "Fix up Network and Internet Slice" into qt-dev am: d79e9c498a 
am: 7b5b8e620b

Change-Id: I8a94ce194a640d96f15903e083319e012fc68bcc
 2019-04-10 15:20:19 -07:00
Fan Zhang
0942837083 Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev am: 6dd38b462f 
am: 9be307720b

Change-Id: I0ef02e15d469144ba142d21c3e5a377c08dc4db7
 2019-04-10 15:03:23 -07:00
Julia Reynolds
af2195bd98 Merge "Use correct key value" into qt-dev 
am: b2bf285911

Change-Id: I65e833cce5f840cae2d2dfd46526ee9e1f23d4c8
 2019-04-10 14:32:42 -07:00
Matthew Fritze
7b5b8e620b Merge "Fix up Network and Internet Slice" into qt-dev 
am: d79e9c498a

Change-Id: I4f7036c642a15c187ecd1bb067765396da40aae4
 2019-04-10 14:27:50 -07:00
Fan Zhang
885036d1ef Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev am: aa599e737a 
am: 1e5d1ba5ff

Change-Id: I881c70632507d939c9cbacd8d2986d9226b7d998
 2019-04-10 14:03:09 -07:00
TreeHugger Robot
8d9dadb1a2 Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev 2019-04-10 20:57:23 +00:00
Jack Yu
826ad9451c Merge "Correct SecureNfc behavior in setting page" into qt-dev am: 0333b07a1e 
am: f7422c7e68

Change-Id: Idf69029762175b412c75769d34ca8a22e7f8d41c
 2019-04-10 13:57:13 -07:00
TreeHugger Robot
9eef4964a4 Merge "Creates user_switcher_enabled setting to match setting" into qt-dev 2019-04-10 20:46:22 +00:00
TreeHugger Robot
0c6ead9e61 Merge "Allow user without a password to clear credentials" into qt-dev 2019-04-10 20:36:22 +00:00
Lei Yu
8a09cb1c67 Merge "Override height of SliceView in Settings" into qt-dev am: 7c7dbe20c7 
am: 01626fd7d5

Change-Id: Ic6fa39e3c3792e97369cc38a73894816ff8210f9
 2019-04-10 13:32:40 -07:00
Fan Zhang
9be307720b Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev 
am: 6dd38b462f

Change-Id: I4354f0a2482891e95e89c6a15bd44b8633849dfd
 2019-04-10 13:19:12 -07:00
TreeHugger Robot
3b7cdfb708 Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev 2019-04-10 20:01:32 +00:00
Andrew Sapperstein
b61e1566ef Merge "Updates to data usage prefs" into qt-dev am: 8bd90f58bf 
am: 028b2fec43

Change-Id: I071e491c6d0df447f331333c5c6a38cbe798c781
 2019-04-10 12:56:07 -07:00
Fan Zhang
1e5d1ba5ff Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev 
am: aa599e737a

Change-Id: Ib34b49b163c5753d5eda17a1e7521436fedd2678
 2019-04-10 12:49:12 -07:00
Julia Reynolds
b2bf285911 Merge "Use correct key value" into qt-dev 2019-04-10 19:46:58 +00:00
TreeHugger Robot
d79e9c498a Merge "Fix up Network and Internet Slice" into qt-dev 2019-04-10 19:44:42 +00:00
Fan Zhang
6dd38b462f Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev 2019-04-10 19:29:58 +00:00
Fan Zhang
b64d16dcad Rename resource variable names: homepage_* -> contextual_* 
Fixes: 130250419
Test: rebuild
Change-Id: I497f2d8e48fb6b5cd54b40e5f5b0691de0e19b1c
 2019-04-10 12:25:10 -07:00
Fabian Kozynski
a52961d803 Creates user_switcher_enabled setting to match setting 
When the user enters UserSettings, the switch displays the setting as
on, but the setting is not created until the user modifies this for the
first time. This change makes sure that the setting is created when the
user enters UserSettings for the first time.

Fixes: 130270878
Test: manual, switch to second user and observe switcher icons.
Change-Id: I30bc5025c178da3668a76c828c34545c1d98b085
 2019-04-10 15:22:20 -04:00
Jonathan Koo
af0f6960df Merge "Address UI change request for injected services" into qt-dev am: 82af1830d7 
am: 42c1dc6da1

Change-Id: Icea5e21286af44576aa6445b06121e4e2ab43f0d
 2019-04-10 12:07:44 -07:00
Raff Tsai
4bbb0542a2 Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev am: cd576f15a3 
am: a75795840e

Change-Id: I702d0d79277933e690c44f7d75d27b7ff98dd2f6
 2019-04-10 12:06:46 -07:00
Jack Yu
f7422c7e68 Merge "Correct SecureNfc behavior in setting page" into qt-dev 
am: 0333b07a1e

Change-Id: Icc9b9b84572ef063051ade9a2ffbd6c1a30088da
 2019-04-10 11:56:38 -07:00
Lei Yu
01626fd7d5 Merge "Override height of SliceView in Settings" into qt-dev 
am: 7c7dbe20c7

Change-Id: I8f3af9068bab3116e8f7738db5e343862d15058d
 2019-04-10 11:55:41 -07:00
Andrew Sapperstein
028b2fec43 Merge "Updates to data usage prefs" into qt-dev 
am: 8bd90f58bf

Change-Id: I1e50944c0dd9e6b67f2d9435268ac98c89d2f0e5
 2019-04-10 11:54:08 -07:00
TreeHugger Robot
aa599e737a Merge "Batch rename: homepage_* to contextual_* or condtion_*" into qt-dev 2019-04-10 18:25:45 +00:00
Jonathan Koo
42c1dc6da1 Merge "Address UI change request for injected services" into qt-dev 
am: 82af1830d7

Change-Id: Iaec7f7ee83f4bc764940b22343b2c7556cb2b8a6
 2019-04-10 11:10:16 -07:00
Raff Tsai
a75795840e Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev 
am: cd576f15a3

Change-Id: Id176c6e8e413cc7c85a0ac502f6086aca42cc940
 2019-04-10 11:08:54 -07:00
Julia Reynolds
1507891548 Use correct key value 
Test: manual with pre O and O+ apps
Fixes: 130179408
Change-Id: I6a3f815dc441f99509eb334f028f42948e8f9c9e
 2019-04-10 17:53:29 +00:00
TreeHugger Robot
0333b07a1e Merge "Correct SecureNfc behavior in setting page" into qt-dev 2019-04-10 17:18:03 +00:00
Shibin George
a2f013dacb Gracefully handle the case where private volume may be unmountable 
If sdcard was removed while format(as phone storage) was
under progress, blkid can fail to identify the UUID of the
private volume. The PrivateStorageInfo.getTotalSize() API
assumes UUID to be always valid which could simply be not the case.
Avoid calling getTotalSize() on private volume when its state
is unmountable.

Bug: 130203877

Test: 1) Insert sdcard as "portable" storage.
      2) Format it as "phone" storage.
      3) Remove the sdcard while format is in progress.
      4) Insert sdcard again -> blkid may fail to id the sdcard.
         In such case, the fsUuid of the private-volume will be reported as "".
      5) Open "Storage Settings". Settings app crashes:

       FATAL EXCEPTION: main
       Process: com.android.settings, PID: 3700
       ...
       Caused by: java.lang.IllegalArgumentException: Invalid UUID string:
       at java.util.UUID.fromString(UUID.java:194)
       at android.os.storage.StorageManager.convert(StorageManager.java:2139)
       at android.app.usage.StorageStatsManager.getTotalBytes(StorageStatsManager.java:121)
       at com.android.settingslib.deviceinfo.PrivateStorageInfo.getTotalSize(PrivateStorageInfo.java:64)

         However, with this CL, "Storage Settings" can be opened
         and the private volume's state is correctly reflected as "Corrupted".
         User can choose to format the volume again.

Copyright (c) 2019 Qualcomm Innovation Center, Inc. All Rights Reserved.

Change-Id: I764603b5806f43f0c6d398f9d6803646774cd912
 2019-04-10 10:07:44 -07:00
Lei Yu
7c7dbe20c7 Merge "Override height of SliceView in Settings" into qt-dev 2019-04-10 16:56:28 +00:00
Pavel Grafov
0a67bbf89f Allow user without a password to clear credentials 
Currently the code assumes that the user always has a pin or
password or pattern. If there's no password confirmKeyGuard() will
return false, so the acttivity will finish without doing anything.
With this change if there's no PIN/password/pattern, the credential
clearing task will be launched straightaway as the user presses "OK"
the confirmation prompt.

Bug: 127697771
Test: manual
Change-Id: Iac4af0abfc7430ed197e04f833bf203c3f66f52e
 2019-04-10 17:53:32 +01:00
Andrew Sapperstein
8bd90f58bf Merge "Updates to data usage prefs" into qt-dev 2019-04-10 16:49:49 +00:00
Jonathan Koo
82af1830d7 Merge "Address UI change request for injected services" into qt-dev 2019-04-10 16:46:16 +00:00
TreeHugger Robot
cd576f15a3 Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev 2019-04-10 16:42:03 +00:00
Julia Reynolds
7425e5a577 Merge "Fix visibility of settings on channel page" into qt-dev am: b5d6ba4caa 
am: b6ea5c437a

Change-Id: I8891f493fdf225db76c372a1bef5c1e9821bc4ef
 2019-04-10 09:18:49 -07:00
lindatseng
306cb6c344 Merge "Should go to wifi page from wifi panel "See more"" into qt-dev am: 62e5be9797 
am: 45783f9193

Change-Id: Icc19daf72d4ced1b47d954a29e93ea3f584d4ebf
 2019-04-10 09:15:49 -07:00
Julia Reynolds
b6ea5c437a Merge "Fix visibility of settings on channel page" into qt-dev 
am: b5d6ba4caa

Change-Id: I1fd03d275d5a816bea85a71a671a0fc84e15db3b
 2019-04-10 08:49:24 -07:00
lindatseng
45783f9193 Merge "Should go to wifi page from wifi panel "See more"" into qt-dev 
am: 62e5be9797

Change-Id: Iada9ee9c30b75b861596082a9f0b98f38f5f912a
 2019-04-10 08:37:50 -07:00
TreeHugger Robot
b5d6ba4caa Merge "Fix visibility of settings on channel page" into qt-dev 2019-04-10 15:31:35 +00:00
TreeHugger Robot
62e5be9797 Merge "Should go to wifi page from wifi panel "See more"" into qt-dev 2019-04-10 15:18:08 +00:00