Commit Graph

41383 Commits

Author SHA1 Message Date
TreeHugger Robot
d76496dca1 Merge "Added zen settings messages and calls preferences." 2017-11-15 21:59:47 +00:00
Bruno Martins
b011e2a55b Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26 am: 7431ad3a80
am: 440373dbde

Change-Id: I605e13adb0e050ee73e646fa13c62f88271271b6
2017-11-15 21:59:25 +00:00
Bruno Martins
440373dbde Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26
am: 7431ad3a80

Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
2017-11-15 21:56:18 +00:00
Bruno Martins
7431ad3a80 Merge "Settings: Add notification channel for SIM selection"
am: c543d5ba26

Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
2017-11-15 21:54:16 +00:00
Treehugger Robot
c543d5ba26 Merge "Settings: Add notification channel for SIM selection" 2017-11-15 21:45:41 +00:00
Tony Mantler
bd6fcdbd2b Copy proguard rules needed for Lifecycle support
Bug: 69350851
Test: Manual, sadly
Change-Id: Ice2b2697ec269e3ed0d3ca81940948189357cefb
2017-11-15 11:20:57 -08:00
Jeffrey Huang
e50254dce0 Merge "Speed up dev options" 2017-11-15 18:01:07 +00:00
Jeffrey Huang
f1b6d629bf Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4
* changes:
  Phone number in about phone v2
  Dynamic preferences for sim status
  Dynamic preferences for IMEI
2017-11-15 18:00:39 +00:00
Bill Yi
97e75e97ef Import translations. DO NOT MERGE am: fbdea47c44 -s ours am: 8b334cb99a -s ours
am: ecb8315ba4  -s ours

Change-Id: Id12b28467cacd51ac8c899a32971881ca7c4e007
2017-11-15 03:46:04 +00:00
Bill Yi
b1ef79fea9 Import translations. DO NOT MERGE am: cc5fd487eb -s ours
am: 105f962faa  -s ours

Change-Id: I2e67faa4152814ad92f41c710ef80a51f429c52a
2017-11-15 03:45:30 +00:00
TreeHugger Robot
9767b45534 Merge "Send context object to FeatureFlagUtils." 2017-11-15 03:43:24 +00:00
Bill Yi
ecb8315ba4 Import translations. DO NOT MERGE am: fbdea47c44 -s ours
am: 8b334cb99a  -s ours

Change-Id: I62efe62a723ec05fac73635f10b4c54bfaea7961
2017-11-15 03:40:05 +00:00
Bill Yi
105f962faa Import translations. DO NOT MERGE
am: cc5fd487eb  -s ours

Change-Id: I743524b8dce39e4245389fc6c933f0a9578aaac1
2017-11-15 03:39:22 +00:00
Bill Yi
8b334cb99a Import translations. DO NOT MERGE
am: fbdea47c44  -s ours

Change-Id: I791dd2ed3d53ac4230748c61169677190e143919
2017-11-15 03:37:20 +00:00
Xin Li
dcbf7dfd18 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 274f3b22b7

Change-Id: Ibd9ff23599478d4b4fe1af2744b3b6eeaa35d37c
2017-11-15 01:27:15 +00:00
TreeHugger Robot
62b1f581a2 Merge "We need REQUEST_DELETE_PACKAGES to uninstall" 2017-11-15 01:08:54 +00:00
jeffreyhuang
bf234afbbb Speed up dev options
- Put memory updates on background thread
 - Prevent update state from being called twice

Bug: 69000975
Test: Manual
Change-Id: I186bc25f6b74a5098b1737891efee3a6855dc996
2017-11-14 17:05:25 -08:00
Xin Li
274f3b22b7 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I981fa64f2c744afc31502e29df041c091bf98545
2017-11-14 16:38:23 -08:00
Lei Yu
7404059de1 Merge "Fix broken test in NetworkDashboardFragmengTest" 2017-11-14 23:58:54 +00:00
TreeHugger Robot
e91f6ea3e7 Merge "Print icons are now vector graphics." 2017-11-14 22:58:02 +00:00
Bruno Martins
4c7070241a Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
2017-11-14 22:28:59 +00:00
Jeffrey Huang
4c57b33f41 Merge "Rename dev options xml file" 2017-11-14 21:37:24 +00:00
TreeHugger Robot
caacd0068b Merge "Convert SettingsLib Lifecycle to Flatfoot" 2017-11-14 21:21:42 +00:00
jackqdyulei
815f99a84d Fix broken test in NetworkDashboardFragmengTest
Bug: 69314157
Test: RunSettingsRoboTests
Change-Id: I43dbb4c32dec8c17dbab3c7425b390a1bd5a3d8e
2017-11-14 13:18:10 -08:00
Bill Yi
fbdea47c44 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
2017-11-14 12:42:27 -08:00
Bill Yi
cc5fd487eb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63
2017-11-14 12:38:18 -08:00
Philip P. Moltmann
dd7441bbe6 We need REQUEST_DELETE_PACKAGES to uninstall
Test: Uninstalled app from settings
Bug: 64576642
Change-Id: Idfb37548c466fb8d06c100f7ffd5e4390d0bde1c
2017-11-14 11:21:50 -08:00
Beverly
a58e52a0be Added zen settings messages and calls preferences.
- Made ZenModeSettings and ZenModeBehaviorSettings a DashboardFragment
- Switches in ZenModeBehaviorSettings all have their own preference controllers
- Instead of a dropdown, messages & calls have their own pages & preference controllers
- Added basic turn on/off DND button in settings (dialog not yet implemented)

Bug: 63077372
Fixes: 69057767
Test: make -j40 RunSettingsRoboTests
Change-Id: I1c70f77053713f66f873ee578477f23cfd7985bb
2017-11-14 14:16:26 -05:00
Tony Mantler
94a7c7d21c Convert SettingsLib Lifecycle to Flatfoot
Bug: 69257739
Test: m -j RunSettingsRoboTests
Change-Id: I27e7850c39afb9c09297007e8cc352f410665653
2017-11-14 11:04:40 -08:00
Jeffrey Huang
e1ead4d3d0 Merge "Use uname instead of proc/version" 2017-11-14 18:11:07 +00:00
Fan Zhang
06b0d5b564 Send context object to FeatureFlagUtils.
Bug: 36222960
Test: robotests
Change-Id: I9ca2d8c679474e545988f518eaf32acf459abd2c
2017-11-14 09:24:31 -08:00
Fan Zhang
4f74ed2d07 Merge "Remove the feature flag for using new title." 2017-11-14 17:16:41 +00:00
William Luh
7705af1cf7 Merge "Change security status icons." 2017-11-14 16:59:45 +00:00
TreeHugger Robot
a40f6a2a45 Merge "Convert location settings to DashboardFragment." 2017-11-14 03:02:25 +00:00
TreeHugger Robot
745e9c13b5 Merge "Allow SettingsIntelligence to access SearchResultTrampoline" 2017-11-14 02:01:37 +00:00
Doris Ling
4a01283309 Remove the feature flag for using new title.
- remove all code that check for the feature flag, and use the new logic
by default.

Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6
Fixes: 64564191
Test: make RunSettingsRoboTests
2017-11-13 17:58:13 -08:00
TreeHugger Robot
6483cf1eba Merge "Expand all preferences when launch from search." 2017-11-14 01:51:52 +00:00
TreeHugger Robot
dfdc85c339 Merge "Add private dns dialog in wifi settings" 2017-11-14 01:12:58 +00:00
Doris Ling
9ed29a2e57 Convert location settings to DashboardFragment.
- change LocationMode, LocationSettings, and ScanningSettings to be
DashboardFragment.
- remove LocationSettingsBase and moved base logics into base
controller.
- add controllers for the preferences under the 3 location settings
pages.

Fixes: 68719207
Test: make RunSettingsRoboTests
Change-Id: Icedf691c2a9f7989faebee39ea9da672209b7957
2017-11-13 17:05:14 -08:00
jeffreyhuang
d5e2fd30a9 Rename dev options xml file
Bug: 34203528
Test: Builds and tests still pass
Change-Id: I7990555244c57f526b8609ae11154683aed889be
2017-11-13 16:58:55 -08:00
TreeHugger Robot
bbdc72c95a Merge "Revert "Get rid of SearchIndexableResources entirely."" 2017-11-14 00:42:22 +00:00
Fan Zhang
439921345a Allow SettingsIntelligence to access SearchResultTrampoline
Bug: 64938328
Test: robotests
Change-Id: I89b0b8adf1e034f0fc57a3991fb56452a7210219
2017-11-13 16:27:39 -08:00
Xin Li
0599c79cf7 Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
2017-11-13 15:18:37 -08:00
jackqdyulei
05cb931a31 Add private dns dialog in wifi settings
This option lives in menu. A dialog will show up once this menu
is clicked.

We reuse most of the logic in go/aog/524415 with the following
updates:
1. Use radioGroup instead of directly control radioButton
2. remove bunch of methods if they are only used once.

Following cl will:
1. Remove this feature in development page
2. Add the help link at the bottom of the dialog
3. Disable "Save" button when hostname is invalid.

Bug: 68030013
Test: add for later

Change-Id: I4c6d359dc9c55675858c20e47953ef677b31c3b5
2017-11-13 14:53:14 -08:00
William Luh
fa810112be Change security status icons.
Bug:68209195
Test: make RunSettingsRoboTests
Change-Id: I97c604c09a01c43344adc44004682a1297f038ca
2017-11-13 14:50:01 -08:00
Fan Zhang
6c0c789460 Revert "Get rid of SearchIndexableResources entirely."
Fixes: 69266642

This reverts commit ba0077977f.

Change-Id: I9de6914f194a65ba627b2e5e805884f894fc044f
2017-11-13 22:48:49 +00:00
TreeHugger Robot
63a97d9c50 Merge "Prevent monkey from opening dev options" 2017-11-13 22:46:21 +00:00
TreeHugger Robot
50fb75863e Merge "Revert "Prevent monkey from changing usb settings"" 2017-11-13 22:46:21 +00:00
Philip P. Moltmann
c16600066a Print icons are now vector graphics.
Test: Looked at screens in setting that show this icon
Bug: 69175097
Change-Id: I06c4d37c7c3e641e83fa81d59b651c581e94a9f1
2017-11-13 14:13:17 -08:00
TreeHugger Robot
5fb9348960 Merge "Adding a link to Setting activity for the Home app" 2017-11-13 21:55:23 +00:00