git.osdn.net Git - android-x86/packages-apps-Settings.git/log

OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / log

commit | commitdiff | tree

Lei Yu [Mon, 6 Nov 2017 21:16:37 +0000 (21:16 +0000)]

Merge "Fix crash in settings robo test."

commit | commitdiff | tree

TreeHugger Robot [Mon, 6 Nov 2017 20:29:56 +0000 (20:29 +0000)]

Merge "Guard against a NPE when disconnecting suggestion service."

commit | commitdiff | tree

jackqdyulei [Mon, 6 Nov 2017 18:59:21 +0000 (10:59 -0800)]

Fix crash in settings robo test.

This is a regression from ag/3120176. In AnomalyDialogFragment when
creating the real dialog, it creates the RuntimePermissionPresenter
which causes the stub error.

In this cl we shadow the RuntimePermissionPresenter since in this
test we only focus on that created dialog has the correct message
(dialog title, dialog message)

Bug: 68941201
Test: RunSettingsRoboTests
Change-Id: I9c09922453f7797f375d0f61b9d8eba660bfbfef

commit | commitdiff | tree

Fan Zhang [Mon, 6 Nov 2017 18:30:05 +0000 (10:30 -0800)]

Guard against a NPE when disconnecting suggestion service.

Change-Id: Ib10502b9467365f6e348737655806ef2369a747b
Fixes: 68885411
Test: robotests

commit | commitdiff | tree

Jeffrey Huang [Mon, 6 Nov 2017 17:54:24 +0000 (17:54 +0000)]

Merge "Rtl layout support for about phone v2"

commit | commitdiff | tree

TreeHugger Robot [Mon, 6 Nov 2017 17:42:39 +0000 (17:42 +0000)]

Merge "Enforce null check for mAccessPoint"

commit | commitdiff | tree

TreeHugger Robot [Sat, 4 Nov 2017 01:19:31 +0000 (01:19 +0000)]

Merge "Create a dialog for firmware version"

commit | commitdiff | tree

Ningyuan Wang [Fri, 3 Nov 2017 18:16:56 +0000 (11:16 -0700)]

Enforce null check for mAccessPoint

mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Nov 2017 23:03:02 +0000 (23:03 +0000)]

Merge "Move trust agent helper methods into TrustAgentManager"

commit | commitdiff | tree

jeffreyhuang [Thu, 2 Nov 2017 18:01:18 +0000 (11:01 -0700)]

Create a dialog for firmware version

- create xml layout files for dialog
- create some new strings
- create new FirmwareVersionPreferenceControllerV2
- create a new dialog fragment for firmware version

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Icc567ff6aa1eedc1ab02c20e0d22529457c33466

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Nov 2017 22:12:43 +0000 (22:12 +0000)]

Merge "Popup a dialog to display sim status information"

commit | commitdiff | tree

jeffreyhuang [Fri, 3 Nov 2017 21:46:23 +0000 (14:46 -0700)]

Rtl layout support for about phone v2

- Add textAlignment attribute so that text has correct alignment in rtl
layouts

Bug: 36458278
Test: manual with settings app
Change-Id: I9360ae517290d0b115289e739441684588d4c216

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Nov 2017 21:24:41 +0000 (21:24 +0000)]

Merge "Move security settings to security package"

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Nov 2017 19:48:19 +0000 (19:48 +0000)]

Merge "Remove duplicate preferences in Accessibility settings."

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 17:06:21 +0000 (10:06 -0700)]

Move trust agent helper methods into TrustAgentManager

Bug: 32953042
Test: robotests
Change-Id: Ia8dae2e583f0faf7bded150dac65ed076f4ea576

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 16:35:12 +0000 (09:35 -0700)]

Move security settings to security package

Bug: 32953042
Test: robotests
Change-Id: Ibd5a12bdd22825dde723e107050826cce9839926

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 17:39:21 +0000 (17:39 +0000)]

Merge "Move trustagent to security package."

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 16:45:38 +0000 (16:45 +0000)]

Merge "Convert the rest of encryption page into pref controller"

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:48:56 +0000 (17:48 -0700)]

Move trustagent to security package.

Bug: 32953042
Fixes: 34461256
Test: robotests
Change-Id: I341076ff320ad60081542a96eb588614230cb13e

commit | commitdiff | tree

TreeHugger Robot [Fri, 3 Nov 2017 01:52:03 +0000 (01:52 +0000)]

Merge "Convert encryption status to preference controller"

commit | commitdiff | tree

Doris Ling [Thu, 2 Nov 2017 23:44:50 +0000 (16:44 -0700)]

Remove duplicate preferences in Accessibility settings.

- addPreferencesFromResource() call has been added to
InstrumentedPreferenceFragment, and hence sub-class should not call it
again.

Change-Id: Ia016d9d407ac3f838c962d1ced585647382a051a
Fixes: 68820835
Test: make RunSettingsRoboTests

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:50:40 +0000 (00:50 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours am: 5af580a419 -s ours am: fbc2fd065c -s ours
am: eb7e3e0385 -s ours

Change-Id: Ib18d78964eb40d8a9bfa73d8cc62ca549f9e7212

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:47:06 +0000 (00:47 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours am: 5af580a419 -s ours
am: fbc2fd065c -s ours

Change-Id: I37ea4fa3cc14ee73b5bb2bc34612b6f1501c8c20

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:42:12 +0000 (00:42 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours
am: 5af580a419 -s ours

Change-Id: I83bbad093fdcf90649ce39efbd9783a584d2b7c1

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:40:07 +0000 (00:40 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours
am: ef61a45cf6 -s ours

Change-Id: If9d124cc6a362a152345a04e0748cd71c6fac42a

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:38:04 +0000 (00:38 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours
am: e981e0b855 -s ours

Change-Id: I32df0f311eca598b6b6969f288b258f65e43ae49

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours
am: d15a81f882 -s ours

Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +0000)]

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +0000)]

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +0000)]

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours
am: 5f02135c42 -s ours

Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours
am: 1de093b1a1 -s ours

Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours
am: b17703e871 -s ours

Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:13:11 +0000 (00:13 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
am: 1c040c7414 -s ours

Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:07:32 +0000 (00:07 +0000)]

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev

commit | commitdiff | tree

Fan Zhang [Thu, 2 Nov 2017 21:09:34 +0000 (14:09 -0700)]

Convert the rest of encryption page into pref controller

Bug: 32953042
Test: robotests
Change-Id: I6c1b28314a988e6499065ddaee2aeae0ac28c537

commit | commitdiff | tree

Fan Zhang [Thu, 2 Nov 2017 00:59:53 +0000 (17:59 -0700)]

Convert encryption status to preference controller

- Move Crypt/Encryption setting into security package.
- Reformat crypt_keeper_settings.xml
- Add controller and test for encryption status

Bug: 32953042
Test: robotests
Change-Id: I1f4b2f97133435c70a49522a59886ac4da6759af

commit | commitdiff | tree

Fan Zhang [Tue, 10 Oct 2017 21:06:04 +0000 (14:06 -0700)]

Set device credential's Window flag to be SECURE.

This prevents showing any pattern/pin in recent list.

Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Test: manual

commit | commitdiff | tree

TreeHugger Robot [Thu, 2 Nov 2017 23:01:52 +0000 (23:01 +0000)]

Merge "Add flag to not connect in WifiDialogActivity"

commit | commitdiff | tree

Jeffrey Huang [Thu, 2 Nov 2017 20:30:36 +0000 (20:30 +0000)]

Merge "Popup a dialog to display user IMEI information"

commit | commitdiff | tree

TreeHugger Robot [Thu, 2 Nov 2017 18:52:25 +0000 (18:52 +0000)]

Merge "Add screen resource for Colors setting."

commit | commitdiff | tree

jeffreyhuang [Fri, 27 Oct 2017 21:41:56 +0000 (14:41 -0700)]

Popup a dialog to display sim status information

- Create layout files for the dialog
- Create a new controller to launch the dialog activity
- Create a new controller to update the contents of the dialog
- Deprecate old files that are no longer used in about phone v2

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Iaf4f5e53c83b27f148acb076f38bfeabff41087e

commit | commitdiff | tree

Maurice Lam [Wed, 1 Nov 2017 04:46:38 +0000 (21:46 -0700)]

Add flag to not connect in WifiDialogActivity

Add flag connect_for_caller, which if false will not connect to the
Wi-Fi network on behalf of the caller.

Test: cd tests/robotests && mma
Bug: 34951731
Change-Id: Ie24a8ed1891aea1caec75a2de9a3d2bdb3dad8a7

commit | commitdiff | tree

TreeHugger Robot [Thu, 2 Nov 2017 06:24:41 +0000 (06:24 +0000)]

Merge "Improve settings cold start latency."

commit | commitdiff | tree

Malcolm Chen [Thu, 2 Nov 2017 00:52:22 +0000 (00:52 +0000)]

Merge "Updates strings for "Emergency broadcast"." am: b13f2e0fb0 am: 32ced85d54
am: 47599f8685

Change-Id: I256a30e5267e618c00253151646823476fa6909f

commit | commitdiff | tree

Malcolm Chen [Thu, 2 Nov 2017 00:50:20 +0000 (00:50 +0000)]

Merge "Updates strings for "Emergency broadcast"." am: b13f2e0fb0
am: 32ced85d54

Change-Id: I70e6fba701d4ddabfb93129f2b20cf1cc7f6c089

commit | commitdiff | tree

Doris Ling [Wed, 1 Nov 2017 19:54:29 +0000 (12:54 -0700)]

Add screen resource for Colors setting.

- each preference fragment should have its own preference screen layout
in order to show the title correctly. Adding the missing data for
ColorModePreferenceFragment.

Change-Id: I172429dc957f94351456d4bc829897a578d7dbf9
Fixes: 68763217
Test: make RunSettingsRoboTests

commit | commitdiff | tree

Courtney Goeltzenleuchter [Thu, 2 Nov 2017 00:48:17 +0000 (00:48 +0000)]

Merge "Check system support of wide-color" into oc-mr1-dev am: e86bc950df
am: aba6fd61a2

Change-Id: Ic32bf5bd8c77f2ef3ec43e8e1f1b31faa73c0c07

commit | commitdiff | tree

Malcolm Chen [Thu, 2 Nov 2017 00:48:12 +0000 (00:48 +0000)]

Merge "Updates strings for "Emergency broadcast"."
am: b13f2e0fb0

Change-Id: I5b17156c3fd9fa680dc872ddbcab6dd8ac30a87e

commit | commitdiff | tree

Courtney Goeltzenleuchter [Thu, 2 Nov 2017 00:44:46 +0000 (00:44 +0000)]

Merge "Check system support of wide-color" into oc-mr1-dev
am: e86bc950df

Change-Id: I166488d015cc7f8518fd3e3d1cc819fe23cc4ba3

commit | commitdiff | tree

Treehugger Robot [Thu, 2 Nov 2017 00:42:48 +0000 (00:42 +0000)]

Merge "Updates strings for "Emergency broadcast"."

commit | commitdiff | tree

TreeHugger Robot [Thu, 2 Nov 2017 00:40:07 +0000 (00:40 +0000)]

Merge "Check system support of wide-color" into oc-mr1-dev

commit | commitdiff | tree

Fan Zhang [Wed, 1 Nov 2017 21:37:49 +0000 (14:37 -0700)]

Improve settings cold start latency.

- Move view initialization from onViewCreated to onCreateView. This
  doesn't really improve anything, it simply aligns the code more
  with view's lifecycle management.
- Move dashboard category init into background. The init contains logic
  invoking packageManager, which can be very expensive.
  - Remove any call to DashboardFeatureProvider from SummaryLoader, and
    delay the getCategory call until someone calls setListener().
  - call updateCategory() from background thread.

Test: rerun app launch test. Avg latency drops back to pre-suggestion-v2
      level.
Test: robotest
Fixes: 68761512

Change-Id: I5ec85af08e7b610786e439bda93b3651f5975593

commit | commitdiff | tree

Malcolm Chen [Mon, 5 Jun 2017 21:51:37 +0000 (14:51 -0700)]

Updates strings for "Emergency broadcast".

Replace "Emergency broadcast" with "Emergency alerts" to be
consistent.

Test: manual
Bug: b/62291344
Change-Id: I79d6f1162d4c112dedf49a3b43ec26011adba9bf

commit | commitdiff | tree

jeffreyhuang [Wed, 25 Oct 2017 21:44:44 +0000 (14:44 -0700)]

Popup a dialog to display user IMEI information

- Add new dialog fragment to show imei information
- Create layout files for the dialog
- Create a new controller to launch the dialog activity
- Create a new controller to update the contents of the dialog
- Deprecate old files that are no longer used in about phone v2

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I6d4273726e2271049a0ab69c2375dac0ac393e04

commit | commitdiff | tree

TreeHugger Robot [Wed, 1 Nov 2017 20:12:44 +0000 (20:12 +0000)]

Merge "Do not start suggestion loader if host isn't attached."

commit | commitdiff | tree

TreeHugger Robot [Wed, 1 Nov 2017 18:49:14 +0000 (18:49 +0000)]

Merge "Adjust preference alignment."

commit | commitdiff | tree

Fan Zhang [Wed, 1 Nov 2017 17:09:04 +0000 (10:09 -0700)]

Do not start suggestion loader if host isn't attached.

Change-Id: I1ab1de8f0bea6c66d8415e06aedcc7cbc6baf89c
Fixes: 68759380
Test: robotests

commit | commitdiff | tree

TreeHugger Robot [Wed, 1 Nov 2017 16:53:39 +0000 (16:53 +0000)]

Merge "Change the text "Network & Internet""

commit | commitdiff | tree

Jeff Sharkey [Wed, 1 Nov 2017 01:36:50 +0000 (01:36 +0000)]

Merge "Change storage migration to use quota APIs." am: a0afdb0c49 am: 46b8d7ac78 -s ours
am: 226f795066 -s ours

Change-Id: I581640e692dae781d2592fcab26839c251631df7

commit | commitdiff | tree

Fan Zhang [Wed, 1 Nov 2017 01:29:35 +0000 (01:29 +0000)]

Merge "Add a readme with instructions on running tests" am: 08217cbd4b am: 931504bb24
am: 45f3c5b261

Change-Id: Ia45d584ab37ae15b4620f00199a477d913040295

commit | commitdiff | tree

Fan Zhang [Wed, 1 Nov 2017 01:28:30 +0000 (01:28 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours am: 76f30a360c -s ours am: 1b1204be64 -s ours am: ceeb88e6a4 -s ours
am: 97a271f6fb -s ours

Change-Id: If3ae7993ac38d465c58d5f51072499d729a02620

commit | commitdiff | tree

TreeHugger Robot [Wed, 1 Nov 2017 00:32:31 +0000 (00:32 +0000)]

Merge "Convert EncryptionAndCredential into DashboardFragment"

commit | commitdiff | tree

Jeff Sharkey [Tue, 31 Oct 2017 23:50:30 +0000 (23:50 +0000)]

Merge "Change storage migration to use quota APIs." am: a0afdb0c49
am: 46b8d7ac78 -s ours

Change-Id: I80143a5cad80860f2af912adbdaad8690601a798

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:49:31 +0000 (23:49 +0000)]

Merge "Add a readme with instructions on running tests" am: 08217cbd4b
am: 931504bb24

Change-Id: I5e631e039e1fadd499e70fd7ad8d40acc945a9de

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:22:50 +0000 (23:22 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours am: 76f30a360c -s ours am: 1b1204be64 -s ours
am: ceeb88e6a4 -s ours

Change-Id: I124dc166f29f4016c958720c627ee9c1afc21328

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:18:42 +0000 (23:18 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours am: 76f30a360c -s ours
am: 1b1204be64 -s ours

Change-Id: Ia7f4a3d972633cb1cb976550f8cbbd819a8aab3c

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:15:37 +0000 (23:15 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours
am: 76f30a360c -s ours

Change-Id: Ib2f57e3bd9adc14be453af9fc510613d210ffe23

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:11:55 +0000 (23:11 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours
am: 7da421a293 -s ours

Change-Id: Ia717917794165cb2846f0836c9e42350028a3095

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:08:25 +0000 (23:08 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours
am: 9d865d0c3e -s ours

Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:04:53 +0000 (23:04 +0000)]

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:02:45 +0000 (23:02 +0000)]

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:00:42 +0000 (23:00 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours
am: 0c0728a947 -s ours

Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 22:59:59 +0000 (22:59 +0000)]

Merge "Mark core unit tests for Presubmit"

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:59:07 +0000 (22:59 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5
am: b4db530aa5 -s ours

Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:57:12 +0000 (22:57 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08
am: 769e1e31f5

Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:54:07 +0000 (22:54 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613
am: cd66862b08

Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev
am: 8bffdc2613

Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:47:13 +0000 (22:47 +0000)]

Merge "Set device credential's Window flag to be SECURE." into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Tue, 31 Oct 2017 22:24:12 +0000 (22:24 +0000)]

Merge "Change storage migration to use quota APIs."
am: a0afdb0c49

Change-Id: Ie97a6001eb23314c65aff291f53cf575b7637870

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 22:23:15 +0000 (22:23 +0000)]

Merge "Add a readme with instructions on running tests"
am: 08217cbd4b

Change-Id: I654b6bf10ca75715e433d1382756e380723ae324

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 22:23:02 +0000 (22:23 +0000)]

Merge "Switch to use ThreadUtils.postOnMainThread"

commit | commitdiff | tree

Doris Ling [Tue, 31 Oct 2017 00:57:46 +0000 (17:57 -0700)]

Adjust preference alignment.

Remove usage of preference_icon_frame style and re-adjust the layout
attributes to put the title/summary back to correct alignment.

Change-Id: I32a2167404979bad1d086dc871316890e043dff3
Fixes: 68654477
Test: visual

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 21:54:02 +0000 (21:54 +0000)]

Merge "Vibrate when fingerprint error text is shown"

commit | commitdiff | tree

Treehugger Robot [Tue, 31 Oct 2017 21:47:19 +0000 (21:47 +0000)]

Merge "Change storage migration to use quota APIs."

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 21:46:04 +0000 (21:46 +0000)]

Merge "Implement the missing PreferenceControllerMixin interface"

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:43:50 +0000 (21:43 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours am: 96cc88e218 -s ours am: 4aec1cee4e -s ours am: 9c79a61f95 -s ours
am: c583d803af -s ours

Change-Id: I558c2d2d75865c7965d20339d481de6f38a38d16

commit | commitdiff | tree

Treehugger Robot [Tue, 31 Oct 2017 21:42:28 +0000 (21:42 +0000)]

Merge "Add a readme with instructions on running tests"

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:27:18 +0000 (14:27 -0700)]

Convert EncryptionAndCredential into DashboardFragment

The logic still lives in fragment for now. They will be moved into
PrefControllers in follow-up changes.

Bug: 32953042
Test: RoboTests
Change-Id: I2b03d26b5f4e6bbb37b42f9dc83a9464eb169868

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:38:07 +0000 (21:38 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours am: 96cc88e218 -s ours am: 4aec1cee4e -s ours
am: 9c79a61f95 -s ours

Change-Id: Ibaa13379d6b0ed9bd69d66f80989ae7d534efcbf

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:33:53 +0000 (21:33 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours am: 96cc88e218 -s ours
am: 4aec1cee4e -s ours

Change-Id: Id74bf2c46e0454e030e9fc0c4ee231450241aa79

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:29:53 +0000 (21:29 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b am: 0c59dca90d -s ours
am: 96cc88e218 -s ours

Change-Id: Ic182e3df1a283123d0d53c13499af1ed7501767e

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:25:58 +0000 (21:25 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b am: adabc7561b
am: 0c59dca90d -s ours

Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:23:57 +0000 (21:23 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da am: 80af194f8b
am: adabc7561b

Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:21:53 +0000 (21:21 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f am: e79c26a9da
am: 80af194f8b

Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 21:16:44 +0000 (21:16 +0000)]

Merge "Switch to use new activity title handling."

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:16:32 +0000 (21:16 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev am: e69c4dcb8f
am: e79c26a9da

Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:11:26 +0000 (21:11 +0000)]

Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am: e69c4dcb8f

Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 21:02:06 +0000 (14:02 -0700)]

Mark core unit tests for Presubmit

Bug: 68716631
Bug: 68720368
Test: rerun test
Change-Id: Ia8cca6aede824928fc358b005172bbe2ed670c8f

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help