TreeHugger Robot
c99ef27f8d
Merge "Remove "saved networks" from search indexing"
2017-08-16 19:36:34 +00:00
Maurice Lam
2c43d273b8
Merge "Update strings for screen lock setup"
2017-08-16 17:40:52 +00:00
Fan Zhang
ec96dc1542
Remove "saved networks" from search indexing
...
Change-Id: Ic8c1f8cee2c2a325ba3518d52d0c35b230a6abfd
Fixes: 64755091
Test: robotests
2017-08-16 10:31:16 -07:00
Maurice Lam
0c39aa781e
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev am: 0ece5f2a06
...
am: 2dad90da4b
2017-08-16 08:09:50 +00:00
Maurice Lam
2dad90da4b
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
...
am: 0ece5f2a06
2017-08-16 08:04:41 +00:00
TreeHugger Robot
0ece5f2a06
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
2017-08-16 07:51:27 +00:00
TreeHugger Robot
0dfd1f7dc1
Merge "Remove references to NetworkBadging."
2017-08-16 00:11:56 +00:00
Fan Zhang
0764a663fc
Merge "Compute aspect ratio properly"
2017-08-15 23:37:59 +00:00
Maurice Lam
2bb6238044
Don't launch Choose Lock again if recreating
...
When ChooseLockGeneric is recreated, don't automatically launch
ChooseLock[Password/Pattern] even if the corresponding intent extras
are specified, because one would have been launched in the previous
onCreate.
Test: Manual
Bug: 64605627
Change-Id: I227a14abb2f4dd6c4577186a3d8164df0bec7791
2017-08-15 16:26:05 -07:00
Fan Zhang
36717d4399
Compute aspect ratio properly
...
Change-Id: Ic4e1f20f7354b9ab5f4e9c7564d16d06324ec23d
Fixes: 64608152
Test: visual
2017-08-15 11:14:58 -07:00
Eric Schwarzenbach
27a1b76fdc
Remove references to NetworkBadging.
...
Removes all references to the deprecated NetworkBadging class. Replaces
Badging enums with AccessPoint.Speed. Uses SettingsLib Utils class to
get the WifiIcons.
Note: This change depends on ag/2676505.
Bug: 62355275
Test: make -j40 RunSettingsRoboTests
Change-Id: If3301ce30e22a7b2cc4d534b0a89e6d7ddfef45b
2017-08-15 09:49:53 -07:00
Jesse Evans
51a13df33a
Merge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
...
am: eee0e82fba
2017-08-15 02:43:00 +00:00
TreeHugger Robot
7d32761da4
Merge "Add userId to key when type is USER"
2017-08-15 01:47:05 +00:00
Jesse Evans
eee0e82fba
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
...
am: 858ea46a3a
2017-08-15 01:37:07 +00:00
TreeHugger Robot
858ea46a3a
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
2017-08-15 01:18:27 +00:00
Maurice Lam
841288144c
Update strings for screen lock setup
...
Manual cherry pick of 3eb4c8333e
2017-08-14 22:45:30 +00:00
TreeHugger Robot
f621e94873
Merge "Use ThreadUtils instead of AsyncTask to get app title/icon"
2017-08-14 22:38:11 +00:00
Fan Zhang
97e535b603
Use ThreadUtils instead of AsyncTask to get app title/icon
...
Change-Id: I44459d9e4a11329a3bd3bfda5057e05eb7e04d6a
Fixes: 63620905
Test: robotest
2017-08-14 12:46:24 -07:00
jackqdyulei
44dc63ec7b
Add userId to key when type is USER
...
Before this cl, the app list couldn't distinguish different users
because all of them have the same key: USER.
This cl adds userId into key, to make sure the preference key
is unique.
Bug: 64605854
Test: RunSettingsRoboTests
Change-Id: Ia4de2ff85b214465a35f1983ca69a9280d053154
2017-08-14 18:36:31 +00:00
Bill Yi
073c5cbe30
Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours am: fdbe5d9f82 -s ours
...
am: 52744ebaf1
2017-08-14 14:02:17 +00:00
Bill Yi
52744ebaf1
Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
...
am: fdbe5d9f82
2017-08-14 13:49:45 +00:00
Bill Yi
0985ef1bae
Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours am: 6ece6e96fb -s ours
...
am: ffded27909
2017-08-14 13:43:14 +00:00
Bill Yi
ffded27909
Revert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
...
am: 6ece6e96fb
2017-08-14 13:39:44 +00:00
Bill Yi
6a2bef8d80
Merge "Revert "Import translations. DO NOT MERGE""
2017-08-14 13:39:07 +00:00
Bill Yi
2b027338e3
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 5530c73afa
2017-08-14 13:38:36 +00:00
Bill Yi
fdbe5d9f82
Revert "Import translations. DO NOT MERGE"
...
am: d8d29f2964
2017-08-14 13:35:42 +00:00
Bill Yi
6ece6e96fb
Revert "Import translations. DO NOT MERGE"
...
am: d8d29f2964
2017-08-14 13:35:42 +00:00
Bill Yi
d8d29f2964
Revert "Import translations. DO NOT MERGE"
...
This reverts commit a2a4037f59
2017-08-14 13:32:35 +00:00
Bill Yi
7a2b9bbee6
Import translations. DO NOT MERGE am: a2a4037f59 -s ours am: 8944eb96c8 -s ours
...
am: 6b925ea6c9
2017-08-12 18:46:06 +00:00
Bill Yi
7652ef64b9
Import translations. DO NOT MERGE am: a2a4037f59 -s ours am: d3f28537a4 -s ours
...
am: 65dd906932
2017-08-12 18:45:28 +00:00
Bill Yi
6b925ea6c9
Import translations. DO NOT MERGE am: a2a4037f59 -s ours
...
am: 8944eb96c8
2017-08-12 18:43:37 +00:00
Bill Yi
65dd906932
Import translations. DO NOT MERGE am: a2a4037f59 -s ours
...
am: d3f28537a4
2017-08-12 18:42:28 +00:00
Bill Yi
8944eb96c8
Import translations. DO NOT MERGE
...
am: a2a4037f59
2017-08-12 18:39:26 +00:00
Bill Yi
d3f28537a4
Import translations. DO NOT MERGE
...
am: a2a4037f59
2017-08-12 18:39:26 +00:00
TreeHugger Robot
9d7cc33ef0
Merge "Import translations. DO NOT MERGE"
2017-08-12 17:57:59 +00:00
Bill Yi
a2a4037f59
Import translations. DO NOT MERGE
...
Change-Id: I8f1c2c8a6591596db2098eac88bbb99660cfbefa
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 08:56:25 -07:00
Bill Yi
5530c73afa
Import translations. DO NOT MERGE
...
Change-Id: Iac929c86327445553e3c6e60aa22270bd2c43e5d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 08:36:20 -07:00
Maurice Lam
0a40285f50
Update strings for screen lock setup am: 3eb4c8333e
...
am: a773403cd2
2017-08-12 01:32:03 +00:00
Jesse Evans
804b0daf49
Change strings from Instant app account to setting
...
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2
Update strings for screen lock setup
...
am: 3eb4c8333e
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e
Update strings for screen lock setup
...
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Kevin Chyn
e3ca685321
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 2e7b65f74a
...
am: 5e8f4b6320
2017-08-11 17:49:58 +00:00
Kevin Chyn
5e8f4b6320
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
...
am: 2e7b65f74a
2017-08-11 17:34:35 +00:00
TreeHugger Robot
2e7b65f74a
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
2017-08-11 17:26:08 +00:00
Ajay Nadathur
2c2d41f8e9
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
...
am: aec29ee4be
2017-08-11 17:25:31 +00:00
Ajay Nadathur
aec29ee4be
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
...
am: 719d80e6e0
2017-08-11 17:21:24 +00:00
Ajay Nadathur
719d80e6e0
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
2017-08-11 17:12:26 +00:00
Tony Mantler
db02207999
Merge "Don't lose dialogs during configuration change"
2017-08-11 16:28:43 +00:00
Kevin Chyn
a7144ae5b2
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am: 14450c5669
...
am: e54e3de80c
2017-08-11 03:11:27 +00:00
Kevin Chyn
e54e3de80c
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
...
am: 14450c5669
2017-08-11 03:06:19 +00:00
