Commit Graph

49790 Commits

Author SHA1 Message Date
Antony Sargent
a72540089e Update some string char limits
We got a bug requesting slightly longer character limits for of the some
new strings used when displaying information in multi-SIM mode.

Bug: 124474015
Test: n/a
Change-Id: I706586b2fc97ae8e6f0e809d2b3b168c7a9353c1
2019-02-15 11:37:05 -08:00
TreeHugger Robot
cd15971f14 Merge "Move horizontal progress bar into SettingsLib." 2019-02-13 13:53:56 +00:00
TreeHugger Robot
3eaa0ac051 Merge "Fix some problems with the "Mobile network" preference" 2019-02-13 05:44:06 +00:00
Mark Chien
0dae72387f [automerger skipped] Merge "Support entitlement check in DSDS" am: e3b4e0262c am: 0ac1c323b2
am: edc4fd30ea -s ours
am skip reason: change_id Ia4279a418dfa6cd14942b7f4d2a313156066381b with SHA1 1dd1d79d90 is in history

Change-Id: Ie6064467c68640776ec4abffdea90943880effc2
2019-02-12 20:58:48 -08:00
TreeHugger Robot
cfe5635df0 Merge "Show app usage data for the correct cycle." 2019-02-13 04:49:42 +00:00
Fan Zhang
b485a9195d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d am: dd3e2c4f27
am: 80fd417a58

Change-Id: I7b55262d7e3296a29e7efe4d33a4cab70e000175
2019-02-12 20:12:49 -08:00
Mark Chien
edc4fd30ea Merge "Support entitlement check in DSDS" am: e3b4e0262c
am: 0ac1c323b2

Change-Id: I9249eabb454648594ac5e303405f483266eee551
2019-02-12 20:06:32 -08:00
Fan Zhang
80fd417a58 Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
am: dd3e2c4f27

Change-Id: Ia2c1fa2eabcbe784e0d5525baf68d866f2366e6f
2019-02-12 19:33:56 -08:00
Mark Chien
0ac1c323b2 Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27 Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782
2019-02-12 18:41:40 -08:00
Kiyoung Kim
0dd278e85d [automerger skipped] Merge "Schematize ADB system properties" am: 750b90a22b am: 974ace22f9
am: de1971d7a0 -s ours
am skip reason: change_id Iec37f5f35b1452afdf7b15e9f31c4b4726127065 with SHA1 37bd3482ca is in history

Change-Id: Ic69304743c51cb1c07d20ce8d60f8d1c3f269a42
2019-02-12 18:35:41 -08:00
Mark Chien
e3b4e0262c Merge "Support entitlement check in DSDS" 2019-02-13 02:29:01 +00:00
Kiyoung Kim
de1971d7a0 Merge "Schematize ADB system properties" am: 750b90a22b
am: 974ace22f9

Change-Id: I04ab4b50e76d05341b4033c5e44cc6cb62964c39
2019-02-12 18:18:16 -08:00
TreeHugger Robot
d611df7c48 Merge "Misc ui tweaks." 2019-02-13 02:15:54 +00:00
Kiyoung Kim
974ace22f9 Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
2019-02-12 18:06:33 -08:00
Doris Ling
3d238da4b5 Show app usage data for the correct cycle.
- when launching the app data usage from the data usage list, pass the
info about the current cycle that the user is looking at, and select
the same cycle by default when the page is first launched to match the
data on the previous page.

Change-Id: Ic91bd8ee78db4d76551dff4b132c1b74d4b3c19d
Fixes: 123192721
Test: make RunSettingsRoboTests
2019-02-12 16:53:35 -08:00
TreeHugger Robot
545f8b1454 Merge "Update spec for CardPreference" 2019-02-13 00:39:24 +00:00
Fan Zhang
07207c0113 Misc ui tweaks.
- Update conditional card layout
  - move action button from right side to bottom.
  - Get rid of the forking between small/big screens.

- Update a few icons

Fixes: 121189136
Fixes: 124315564
Fixes: 124316920

Test: visual
Change-Id: I205d9995a2d7ed06ad9d32f3cea74f2840a28aed
2019-02-12 16:14:21 -08:00
Fan Zhang
3905ad125d Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" 2019-02-13 00:12:08 +00:00
Fan Zhang
44ee9af03a Merge "Remove the drop shadow in Privacy screen" 2019-02-12 23:30:21 +00:00
Lei Yu
88d6b2f9ad Merge "Add intent action for BT device detail page" 2019-02-12 19:40:18 +00:00
Treehugger Robot
750b90a22b Merge "Schematize ADB system properties" 2019-02-12 18:35:23 +00:00
TreeHugger Robot
ca5786fd27 Merge "Updated permission name according to API review" 2019-02-12 18:27:46 +00:00
Doris Ling
17e807a57e Merge "Separate OTA data usage from SYSTEM_UID." 2019-02-12 18:27:30 +00:00
Fan Zhang
a725c13d65 Merge "Remove sub-text from the lines of AP list in Wi-Fi Slice" 2019-02-12 17:59:05 +00:00
markchien
c992d0f4a9 Support entitlement check in DSDS
Get resource from preferred SIM's subId.

Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b
2019-02-12 16:17:36 +08:00
Jason Chiu
1217bbec70 Remove sub-text from the lines of AP list in Wi-Fi Slice
- Remove sub-text from the lines of AP list
- Add colors to the AP names to indicate the connection status of each AP

Fixes: 120685004
Bug: 120786304
Test: make RunSettingsRoboTests -j
Change-Id: I7b879248528a293d14d959994bb054275f0d69a1
2019-02-12 16:10:06 +08:00
Mark Chien
a432a61943 Merge "Support entitlement check in DSDS" 2019-02-12 08:05:11 +00:00
tmfang
61ba09776c Remove the drop shadow in Privacy screen
Remove shadow in action bar unless page is scrolling.

Test: visual, robotest
Change-Id: I199c659a7a7beecc3b715916b6829a5a879c4c74
Fixes: 123903344
2019-02-12 13:57:50 +08:00
TreeHugger Robot
5999ba5448 Merge "Add carrier settings version to network details page" 2019-02-12 05:01:37 +00:00
TreeHugger Robot
ccdc98e277 Merge "Increase timeout of contextual card pre-check." 2019-02-12 04:38:35 +00:00
TreeHugger Robot
2865b1f07b Merge "Handle simplified Slice deep link intent pattern." 2019-02-12 04:21:34 +00:00
TreeHugger Robot
c5143ceec2 Merge "Add nearby device SlicePreference" 2019-02-12 04:16:26 +00:00
Kiyoung Kim
5e7a15f09a [automerger skipped] Merge "Schematize Display system properties" am: b139a4c16b am: 4d8f4919e0
am: b941bc46b5 -s ours
am skip reason: change_id I83b40ddfcde32d8d03fae73f5c252013933c466c with SHA1 1a3425ed2a is in history

Change-Id: I880ee2758010f1be44e9f24bbc35596fbccea0d8
2019-02-11 19:47:09 -08:00
Kiyoung Kim
b941bc46b5 Merge "Schematize Display system properties" am: b139a4c16b
am: 4d8f4919e0

Change-Id: I35412244d1fa97cb479d060e876bfddac6b523cb
2019-02-11 19:25:50 -08:00
TreeHugger Robot
d9b86280d5 Merge "Fix Wi-Fi DPP fragment back stack problems" 2019-02-12 03:17:57 +00:00
Kiyoung Kim
4d8f4919e0 Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0
2019-02-11 19:13:51 -08:00
Kiyoung Kim
6ade19a3bf Schematize ADB system properties
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
Merged-In: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
2019-02-12 02:58:11 +00:00
Treehugger Robot
b139a4c16b Merge "Schematize Display system properties" 2019-02-12 02:50:08 +00:00
jackqdyulei
ca21544f99 Add nearby device SlicePreference
Change-Id: I9e88602df9ab589c3eea087b1202cbc7615dc810
Fixes: 116327443
Test: RunSettingsRoboTests
2019-02-11 17:38:50 -08:00
TreeHugger Robot
dd1c68b12d Merge "Remove intent-filters from SettingsSliceProvider" 2019-02-12 00:43:03 +00:00
Fan Zhang
f837b899fb Handle simplified Slice deep link intent pattern.
Old intent:
settings://com.android.settings.slices?intent=android-app%3A%2F%2Fcom.android.settings%23Intent%3Baction%3Dcom.android.settings.action.VIEW_SLICE%3BS.slice%3Dcontent%253A%252F%252Fcom.android.settings.slices%252Faction%252Fscreen_magnification_navbar_preference_screen%3B

New intent:
settings://com.android.settings.slices?slice%3Dcontent%253A%252F%252Fcom.android.settings.slices%252Faction%252Fscreen_magnification_navbar_preference_screen%3B

Change-Id: Ia786812c68b5a2b1858203f62494c0d5f5a4a5ba
Fixes: 110156445
Test: manual
2019-02-11 16:25:51 -08:00
TreeHugger Robot
9edcca238b Merge "Don't load anything from contextual card db in legacy mode." 2019-02-12 00:15:25 +00:00
Fan Zhang
671a39f905 Remove intent-filters from SettingsSliceProvider
And remove unused methods from SliceDeepLinkSpringBoard.

This is part 1 of b/110156445

Bug: 110156445
Test: atest
Change-Id: Iab36a97332fd847ed911a9e34b505fd4a64522d3
2019-02-11 15:01:10 -08:00
TreeHugger Robot
00ca556f26 Merge "Create special case mobile data slice" 2019-02-11 22:53:50 +00:00
Antony Sargent
f0d4a3730b Add carrier settings version to network details page
This adds a preference showing the carrier settings version to the
mobile network details page.

Bug: 123995414
Test: make RunSettingsRoboTests
Change-Id: I7b80ead0eadb7375b4404262337e47f75102125c
2019-02-11 14:24:56 -08:00
jackqdyulei
715408e592 Add intent action for BT device detail page
Also update detail page to accept cold start:
1. Check whether profile is ready
2. When it is ready, refresh UI

Bug: 123665527
Test: SettingsRoboTests
Change-Id: I39382fd97e9da46fca08cd2e4a3ef15d32703664
2019-02-11 13:48:16 -08:00
jackqdyulei
8360e0181a Update spec for CardPreference
Make icon and title align to other preference

Bug: 119618813
Test: Manual
Change-Id: I2b088fcfe0b005cde1d79db01806e1919cb131cc
2019-02-11 13:42:41 -08:00
Fan Zhang
07df08950a Don't load anything from contextual card db in legacy mode.
Change-Id: I2fa1ee78bb8878c2cf46fd2f59499c9ed8eb0a09
Fixes: 124246284
Test: robotest
2019-02-11 13:22:02 -08:00
Lei Yu
7946eee850 Merge "Update search for mobile network settings" 2019-02-11 18:00:57 +00:00