Commit Graph

47056 Commits

Author SHA1 Message Date
Dario Freni
e9d83796ac Include NOTICE file in /product partition.
Test: flashed on a device with /product partition and verified licences
are correctly loaded
Bug: 111179267

Change-Id: I2667029128a56baefbec376b0ec4e4ecdb3c3ad4
Merged-In: I12e9169b1d3d313a6c5da0d575a6526327268381
2018-07-11 10:52:53 +01:00
Bill Yi
11ebb14241 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
2018-07-10 22:28:21 -07:00
Bill Yi
6bb90e8cf0 Import translations. DO NOT MERGE
Change-Id: I8e05b06302b091c99cfac9babc6a7ef4abafed17
Auto-generated-cl: translation import
2018-07-10 21:10:39 -07:00
Kevin Chyn
483bd692ef Merge "4/n: Add basic enrollment for Face" 2018-07-11 03:27:02 +00:00
TreeHugger Robot
7adfcf6819 Merge "Add a few pages to search index." 2018-07-11 01:46:15 +00:00
Kevin Chyn
44c0681122 Merge "Fixed various strings & limits" 2018-07-11 01:43:17 +00:00
Kevin Chyn
ea65b51a36 4/n: Add basic enrollment for Face
Bug: 110589286

Test: fingerprint enrolling still works
Test: enrollment flow with and without a pin set up still works properly
Test: enrollment continues when configuration changes, stops otherwise

Change-Id: I39f76c7f1a16e9533cef573f87cf4b81cb20cb18
2018-07-10 18:39:19 -07:00
Lei Yu
b07d1f34c6 Add sanity check method for BatteryTip
This method is used to check whether data in battery tip is still
valid. If not, try recover the data or dismiss the tip.

Change-Id: Idc9e4d49f99e33d3f5e82e694dc78227fc1da41c
Fixes: 111218723
Test: RunSettingsRoboTests
2018-07-10 18:06:17 -07:00
Fan Zhang
4560ab7a35 Add a few pages to search index.
- Data saver
- A few special permission access pages
   - Picture-in-picture
   - Premium sms
   - do not disturb access
- And a unrelated cleanup: move EmptyTextFragment from
  notification/ to widget/

Bug: 70720645
Test: robotests
Change-Id: I6a87f712bf81f9fd32fa9a3826fba851ca748409
2018-07-10 17:02:09 -07:00
Lei Yu
dc313813e6 Merge "Remove DeviceProfilesSettings" 2018-07-10 23:01:13 +00:00
TreeHugger Robot
7b52cb3059 Merge "Update auto brightness pref summary to show on/off" 2018-07-10 20:36:44 +00:00
jackqdyulei
af129e4f6b Remove DeviceProfilesSettings
It's not used anymore since we have a bt detail page.

Change-Id: Ib2ecfabf544913701ca613048e9f37e297ffff18
Fixes: 111305587
Test: robo still pass
2018-07-10 13:31:15 -07:00
Salvador Martinez
3ba12d0086 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev am: 4804c2c7a5
am: 94bebd2f80

Change-Id: Ia5274cd69ce2d6208cf9490b7a41ec080090cb6f
2018-07-10 12:46:09 -07:00
Salvador Martinez
94bebd2f80 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
am: 4804c2c7a5

Change-Id: I81b835965ee39d8c877e834820ca21543d18d654
2018-07-10 12:41:50 -07:00
TreeHugger Robot
4804c2c7a5 Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev 2018-07-10 19:33:29 +00:00
Fan Zhang
b0eab98754 Update auto brightness pref summary to show on/off
Change-Id: I7914957cc9dbffcc12e34fc714bb9c37783a4f33
Fixes: 109885418
Test: robotests
2018-07-10 11:27:25 -07:00
TreeHugger Robot
5486812fc6 Merge "Update airplane mode pref key so it's sliceable." 2018-07-10 17:45:28 +00:00
Kevin Chyn
88f677f498 Fixed various strings & limits
Fixes: 111170847
Fixes: 111137762
Fixes: 111174545
Fixes: 111174330
Fixes: 111174332
Fixes: 111173644

Test: builds
Change-Id: Ia39fe7b70a1bb5ac6f71c8244268aab51deed0ee
2018-07-10 10:40:32 -07:00
Fan Zhang
9c75b6513e Update airplane mode pref key so it's sliceable.
Bug: 110403709
Test: rebuild slice db
Change-Id: I16e13ec67705754fc55d8c797f94e407f617722c
2018-07-10 09:46:32 -07:00
xiamin
3c2956a08c new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.

Bug: https://partnerissuetracker.corp.google.com/u/2/issues/111261338
Test: empty string can not be set as a password

Signed-off-by: xiamin <xiamin@xiaomi.com>
2018-07-10 10:48:56 +08:00
TreeHugger Robot
afaee2c4cf Merge "Fix NPE when querying AmbientDisply through ExternalSeting" 2018-07-10 02:11:34 +00:00
Fan Zhang
d7d1e8063a Fix NPE when querying AmbientDisply through ExternalSeting
Bug: 110403709
Test: manual
Change-Id: I5c037b010e296cbd011f8c141932e6befd341c99
2018-07-09 17:35:35 -07:00
Hall Liu
ed31d718ad Merge "Fix usage of SubscriptionInfo ctor" 2018-07-10 00:08:14 +00:00
TreeHugger Robot
d7f4782bbc Merge "Handle special case slices" 2018-07-09 23:17:59 +00:00
TreeHugger Robot
d0ecbe1c33 Merge "ZenScheduleRule is valid even if it never occurs" 2018-07-09 22:28:55 +00:00
Salvador Martinez
78c3f368c3 Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.

Test: robotests updated
Bug: 110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
2018-07-09 11:52:34 -07:00
Matthew Fritze
56b2bad05e Handle special case slices
Create a handler for any slice that doesn't include anything
from a PreferenceController.

Test: robotests
Change-Id: If23947152d61877537d0cac6240e96b9ab977bce
Bug: 80263568
2018-07-09 11:21:25 -07:00
TreeHugger Robot
416a11855e Merge "Ask profile password before unifying to prevent untrusted reset" 2018-07-09 18:07:36 +00:00
Pavel Grafov
bf924bf8dd [automerger skipped] Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev am: dc2db6c6c9
am: 0886bf2271  -s ours

Change-Id: I77850967d6d28f6f638bb7327def038e365c653c
2018-07-09 10:54:22 -07:00
Pavel Grafov
0886bf2271 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am: dc2db6c6c9

Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
2018-07-09 10:49:22 -07:00
TreeHugger Robot
0da46d618e Merge "Fix NPE when querying AmbientDisply through ExternalSeting" 2018-07-09 17:45:34 +00:00
TreeHugger Robot
dc2db6c6c9 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev 2018-07-09 17:37:19 +00:00
Beverly
322a022442 ZenScheduleRule is valid even if it never occurs
Bug: 111167252
Test: make RunSettingsRoboTests -j40
Change-Id: Ibb564b2b0bca049afb17641e372276e58e487df2
2018-07-06 12:05:00 -04:00
Pavel Grafov
80d9020cc2 Ask profile password before unifying to prevent untrusted reset
Test: make -j RunSettingsRoboTests
Test: manual, unify when profile lock is compliant
Test: manual, unify when profile lock is not compliant
Test: manual, unify when profile lock is empty
Fixes: 110262879

Change-Id: I0dfa885f2a0e44e09c217b3e7766b367f1340c9e
2018-07-06 14:40:10 +01:00
Bill Yi
797ab048bc [automerger skipped] Import translations. DO NOT MERGE am: e338a41dac -s ours
am: 1d8eba660f  -s ours

Change-Id: Id6f319ff37f94400ff9bd0379fe3da2567c1445f
2018-07-05 20:15:20 -07:00
Bill Yi
1d8eba660f [automerger skipped] Import translations. DO NOT MERGE
am: e338a41dac  -s ours

Change-Id: Ifb7f5f0271381fb960b74722457a58ddb82429cf
2018-07-05 20:03:16 -07:00
TreeHugger Robot
326132734a Merge "Import translations. DO NOT MERGE" 2018-07-05 04:17:36 +00:00
Bill Yi
e338a41dac Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
2018-07-04 21:09:50 -07:00
TreeHugger Robot
9fa595f9c2 Merge changes from topic "q_dark_theme"
* changes:
  Move NightMode to Display settings
  Revert "Setting to change sysui theme"
2018-07-05 03:46:24 +00:00
Bill Yi
d845a6eb7a Import translations. DO NOT MERGE
Change-Id: I43de322478c209034c56686b9f2ca195ed1eb815
Auto-generated-cl: translation import
2018-07-04 19:51:56 -07:00
Pavel Grafov
f9429262d2 Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.

Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit f14de789f4)
2018-07-04 13:02:03 +00:00
TreeHugger Robot
6098784bd5 Merge "Fix new user setting in a call" 2018-07-03 22:35:45 +00:00
Matthew Fritze
73537507ee [automerger skipped] Merge "Conditionally block battery percantage from search" into pi-dev am: ea97a66383
am: 76acf317a5  -s ours

Change-Id: I037b7f21c32474a769d4e870664b3e6d812148f3
2018-07-03 14:43:46 -07:00
Matthew Fritze
76acf317a5 Merge "Conditionally block battery percantage from search" into pi-dev
am: ea97a66383

Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
2018-07-03 14:39:07 -07:00
TreeHugger Robot
ea97a66383 Merge "Conditionally block battery percantage from search" into pi-dev 2018-07-03 21:35:32 +00:00
Yongjiang Wu
5b120e7479 Fix new user setting in a call
In a call, the flag of UserManager is changed, then "Add user" and
"Guest" items in Settings are still enabled.
To fix this issue, these items will be disabled according to
"UserManager#canSwitchUsers".

Bug: 80447394
Test: make RunSettingsRoboTests ROBOTEST_FILTER=UserSettingsTest
Change-Id: Ib4c754603418528f5c6f1c78b8aabf33e863c8b9
2018-07-03 14:20:39 -07:00
Android Build Merger (Role)
59fb3997b7 Merge "[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am: f406fd7976 am: 13d51cd39a -s ours" 2018-07-03 20:55:43 +00:00
Lei Yu
861480bb49 [automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am: f406fd7976
am: 13d51cd39a  -s ours

Change-Id: Ifd51d45a75bb245c2853773a966c6accb226b5ba
2018-07-03 13:54:42 -07:00
TreeHugger Robot
2fcd7a1cd3 Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." 2018-07-03 20:54:29 +00:00
TreeHugger Robot
666de4528b Merge "Using icon resource instead of icon bitmap in task description" 2018-07-03 20:47:16 +00:00