Commit Graph

47686 Commits

Author SHA1 Message Date
TreeHugger Robot
cc9ffafb80 Merge "Remove custom Robolectric util class." 2018-09-28 16:18:28 +00:00
TreeHugger Robot
3f9ded6206 Merge "Changed the app_version type" 2018-09-28 03:33:22 +00:00
tmfang
a09325ea18 Remove custom Robolectric util class.
We directly use Robolectric/ActivityController to
setup an FragmentActivity lifecycle.

So, I removed the custom Robolectric in robotests/testutils.

Change-Id: Ib93265f719e1eb9606c9ad6f05c1dd1957302e8b
Fixes: 111195450
Test: robotests
2018-09-28 11:26:17 +08:00
TreeHugger Robot
5f9d178360 Merge "A new attribute which can show the dynamic summary" 2018-09-28 02:38:12 +00:00
Kevin Chyn
a94e1aaf34 Merge "Update FaceSettings to match mocks" 2018-09-28 02:12:55 +00:00
TreeHugger Robot
f2b61c9c5c Merge "Import translations. DO NOT MERGE" 2018-09-27 19:36:26 +00:00
Doris Ling
2581c09679 Merge "Use the loader to get usage data for each billing cycle." 2018-09-27 17:15:58 +00:00
Sunny Shao
672febf859 Changed the app_version type
- Updated type from string to long and saved the PackageInfo.getLongVersionCode
- Modified CardDatabaseHelper, ContextualCard, CardContentProviderTest

Bug: 111820446
Test: robotest
Change-Id: Id2d39f15a1743b9f38044354a0c3b2584329bab9
2018-09-27 17:46:55 +08:00
Bill Yi
203789f697 Import translations. DO NOT MERGE
Change-Id: I9a392b846a54d62f9152f3c102ef3cd6ea3a0689
Auto-generated-cl: translation import
2018-09-26 19:37:25 -07:00
Fan Zhang
67793945f0 Remove custom robotest utils in favor of framework support.
Bug: 111195450
Fixes: 111195167
Test: robotests
Change-Id: I8bea43fd86f9ae5ce40eb16dabf733b0fbe89aae
2018-09-26 17:28:08 -07:00
Fan Zhang
9f3cd7a621 [automerger skipped] Clean up task affinity. am: ff3652e0a3
am: eb43cc70c8  -s ours

Change-Id: I21db6e54e025668c68ed3ff1d62dd13925790f8f
2018-09-26 15:48:17 -07:00
Fan Zhang
eb43cc70c8 Clean up task affinity.
am: ff3652e0a3

Change-Id: I6727cae2ce9330860ad40104b20e00e8ecf58556
2018-09-26 15:23:11 -07:00
Doris Ling
654adf9c9e Use the loader to get usage data for each billing cycle.
Bug: 111751694
Test: make RunSettingsRoboTests
Change-Id: I4242687b404a290e81d43c505b9afbd2a07aafdb
2018-09-26 13:33:10 -07:00
Kevin Chyn
a8843f2959 Update FaceSettings to match mocks
Settings page should not show if device credential is not confirmed

Bug: 111548037
Fixes: 116531896

Test: adb shell settings get secure face_unlock_app_enabled
Test: make -j56 RunSettingsRoboTests

Change-Id: I651ee88e9ee4017ee3dc52fa8a5d05cb8f092e1d
2018-09-26 11:50:02 -07:00
Fan Zhang
ff3652e0a3 Clean up task affinity.
If activity is launched through external intent, back button should just
go back to previous screen.

Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug: 112254258
Fixes: 111864355
Test: manual
2018-09-26 17:53:05 +00:00
Mill Chen
092f66b279 Merge "Add Data usage slice in Contextual Settings Homepage" 2018-09-26 14:55:31 +00:00
Leon Liao
1f1671ca28 Merge "Rename isConnectable()" am: ec65174f11 am: 09385137e3
am: af7aed6d79

Change-Id: I5b0a11396ccce092778b6cfda444f52cfd469525
2018-09-26 06:25:41 -07:00
Leon Liao
af7aed6d79 Merge "Rename isConnectable()" am: ec65174f11
am: 09385137e3

Change-Id: Iffe650dd574633cacc6197c6f6f69316b528fb0a
2018-09-26 06:14:55 -07:00
Leon Liao
09385137e3 Merge "Rename isConnectable()"
am: ec65174f11

Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e
2018-09-26 05:59:20 -07:00
tmfang
8eb46b717e A new attribute which can show the dynamic summary
For now, slice view shows screen title by default,
but it isn't approprate for some simple cases.
ie, device model, phone number, android version etc.

So, We create a new attribue which let BasePreferenceController
be more flxible. User can choose what they want to show
in summary text.

Fixes: 74900516
Test: make RunSettingsRoboTests

Change-Id: I2788c6edfaf8e656170a507607f22513841a3e0a
2018-09-26 17:48:12 +08:00
TreeHugger Robot
c08dcbd700 Merge "Remove check to limit suggestions to 2" 2018-09-25 23:19:13 +00:00
TreeHugger Robot
c22c1be236 Merge "Redo the empty states in print settings" 2018-09-25 23:10:02 +00:00
Leon Liao
ec65174f11 Merge "Rename isConnectable()" 2018-09-25 23:06:20 +00:00
TreeHugger Robot
25d95e0dec Merge "Add 'notificaton blocked' filter to notifications" 2018-09-25 22:34:37 +00:00
TreeHugger Robot
36f47db6ae Merge "Clean up: remove unused SuggestionFeature api." 2018-09-25 22:01:53 +00:00
Fan Zhang
050876fbec Merge "Fix add icon" 2018-09-25 20:56:30 +00:00
Fan Zhang
479be0d5ff Remove check to limit suggestions to 2
This is already enforced from SuggestionService side.

Test: rebuild/robotests
Change-Id: Icd5faa3b7114b369d96459b00b43d4e7eaeae5c5
2018-09-25 20:50:14 +00:00
Fan Zhang
9c5c64891b Clean up: remove unused SuggestionFeature api.
Test: robotests
Change-Id: I91d06d93834674ca6019a86f8b3891198d424d7a
2018-09-25 13:16:59 -07:00
Fan Zhang
394ea1cde5 Merge "Move AppPreference to settingslib, and change imports." 2018-09-25 19:15:19 +00:00
Youming Ye
60118d0618 Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83 am: 31576aae7c
am: d976002dea

Change-Id: Iec53ef5f156b986a61a085a0a7c758574a78cee2
2018-09-25 10:31:48 -07:00
Youming Ye
d976002dea Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83
am: 31576aae7c

Change-Id: Ib37954bccacb44b670ee6c1af6e7188fdd91a46a
2018-09-25 10:27:22 -07:00
Youming Ye
31576aae7c Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am: b7e3552b83

Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
2018-09-25 10:20:06 -07:00
Fan Zhang
dbc988085c Fix add icon
Change-Id: I3ffe5a71081aa03885fa8fada9ae6dff70db6171
Fixes: 116542229
Test: visual
2018-09-25 10:04:15 -07:00
Youming Ye
b7e3552b83 Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" 2018-09-25 17:04:10 +00:00
Fan Zhang
754f737c2c Move AppPreference to settingslib, and change imports.
Bug: 116364655
Test: robotests
Change-Id: I313272737dc7c068c47abf8ea021de7d2bea0a25
2018-09-25 09:51:19 -07:00
Julia Reynolds
a4e51b5238 Add 'notificaton blocked' filter to notifications
Test: robotests
Change-Id: I5c0cd9a2f73b6a22d66df7669e944bbe1473539c
Fixes: 112576746
2018-09-25 09:05:10 -04:00
Mill Chen
736b77c04a Add Data usage slice in Contextual Settings Homepage
- Add Data usage card that implements CustomSliceable in Contextual Settings
Homepage.
- Add test case for Data usage slice.

Bug: 114796538
Test: robotests, manual, SliceViewer
Change-Id: I66a046e8f589a477007ea73e1b22420d3efdebde
2018-09-25 10:46:49 +08:00
timhypeng
eb230c76d9 Fix the logic error on PBAP permission assignment
-add test case

Bug: 114808220
Test: make -j42 RunSettingsRoboTests
Change-Id: Id77ade12c28e31a21c1c7a5dcb28906112d3465b
2018-09-25 01:51:40 +00:00
TreeHugger Robot
468b00f043 Merge "Settings icon pack refresh" 2018-09-25 00:29:23 +00:00
Fan Zhang
1f0879955c Settings icon pack refresh
* ic_add_24dp
* ic_airplane
* ic_arrow_down_24dp
* ic_cellular_off
* ic_data_saver
* ic_device_others
* ic_info_outline_24dp
* ic_search
* ic_night_display
* ic_lock_open
* ic_wifi
* ic_sync
* ic_wallpaper
* ic_phone

Bug: 116360411
Test: visual
Change-Id: I626cbb88043c36d32ab34b90fc83170bca0be12a
2018-09-24 15:40:14 -07:00
Torbjorn Eklund
25249e4314 Merge "ApnEditor: Consider subId when reading carrier config" am: f6f7079709 am: db353e2c4a
am: bfe80e39f2

Change-Id: I848fd4084f43b2aeb69cb5175c1c10de3355c21f
2018-09-24 11:08:59 -07:00
Torbjorn Eklund
bfe80e39f2 Merge "ApnEditor: Consider subId when reading carrier config" am: f6f7079709
am: db353e2c4a

Change-Id: Ie2ad2655b5fc399610acdcfd8327e99c60b7e2a8
2018-09-24 10:57:37 -07:00
Torbjorn Eklund
db353e2c4a Merge "ApnEditor: Consider subId when reading carrier config"
am: f6f7079709

Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
2018-09-24 10:48:00 -07:00
Treehugger Robot
f6f7079709 Merge "ApnEditor: Consider subId when reading carrier config" 2018-09-24 17:24:03 +00:00
TreeHugger Robot
9f553bc863 Merge "Fix account deletion not updating account display" 2018-09-24 17:16:42 +00:00
TreeHugger Robot
7693a7acb7 Merge "Import translations. DO NOT MERGE" 2018-09-23 00:53:28 +00:00
Bill Yi
dc3dd91fac [automerger skipped] Import translations. DO NOT MERGE am: 5a4269d21e -s ours
am: a553a09700  -s ours

Change-Id: I22b8a5fd5b6b1f4c9a1c03ae3161f6993721e74c
2018-09-22 16:08:33 -07:00
Bill Yi
a553a09700 [automerger skipped] Import translations. DO NOT MERGE
am: 5a4269d21e  -s ours

Change-Id: I311f91cf73c826e657061f3fdbafd6e6c9ac5fa9
2018-09-22 16:02:30 -07:00
TreeHugger Robot
72967b934e Merge "Format regression test files" 2018-09-22 22:50:13 +00:00
Bill Yi
5a4269d21e Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I4317549e4010bb2cf75b07ade3cb8d54ba6dc708
2018-09-22 11:38:37 -07:00