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

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

Hansong Zhang [Wed, 30 May 2018 20:23:53 +0000 (13:23 -0700)]

DO NOT MERGE Give PBAP permission only after user confirms
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d

commit | commitdiff | tree

Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]

DO NOT MERGE Give PBAP permission only after user confirms

Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4

commit | commitdiff | tree

Hansong Zhang [Mon, 9 Apr 2018 20:44:07 +0000 (13:44 -0700)]

Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev
am: d59b0eddae

Change-Id: Ia628cc0bd02429ec321d8e80c9d9ad2c097715bd

commit | commitdiff | tree

Hansong Zhang [Mon, 9 Apr 2018 20:43:04 +0000 (13:43 -0700)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6
am: c4127072f4

Change-Id: I559bfa947ae6f7ee89076d05826fd4529d6b0cc2

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:29:54 +0000 (20:29 +0000)]

Merge changes from topic "am-e8b13d24-dee0-4f84-89d4-8a7d110f6ec1" into oc-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc
  [automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa
  DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:50 +0000 (17:48 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617 skipped: b1f00ebf9c

Change-Id: I4f02817d60b302e068caadd21ef4555f5f7d9221

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:48 +0000 (17:48 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238 am: 7b2b84c617

Change-Id: I23c3c75844ff136521f67f94d4d911a44571ae07

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:47 +0000 (17:48 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc am: ee220e0238

Change-Id: I3fdb63225079954bace095dc0ddfd78deb372ff8

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:45 +0000 (17:48 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa am: e25ebddfdc

Change-Id: I5b600093709bf93bb64ccacddeaa3cdf0b470107

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:48:43 +0000 (17:48 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: 4f58c19afa

Change-Id: Ibaab24729318954dbce44f3ccf53fcb4180ac1c7

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 17:48:18 +0000 (10:48 -0700)]

DO NOT MERGE Fix unexpected behavior in Bluetooth pairing

* Set default PBAP permission to false
* Remove all newline and tab characters in Bluetooth device name

Bug: 72872376
Bug: 73173182
Test: manual
Change-Id: Ib3b99017c8da01446ce6302d43dcfb1ef8fba02c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:11 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e skipped: 74ff24d1c6

Change-Id: Idfc539317dd20a0216bb635fa0e014509d451069

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:10 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1 am: 41be25548e

Change-Id: I527b0743bd4b85ddaa7c2bff32523c1876cb8859

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:08 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667 am: 84061c71d1

Change-Id: I1a16852bc9676bf785836576bf034d0a1dc8cf4b

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:07 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2 am: bab8dca667

Change-Id: I72b65a7a76c93dff0dd5ffd9c3747c68c0a382e8

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:05 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666 am: 5d27bdb6d2

Change-Id: I501c5e16642ce2bddb0c5c5e2ed6e0b84fc34029

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:03 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7 skipped: d276b38666

Change-Id: Idf0afa49507f8ead25fd1b59809064f058281076

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:02 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3 am: dfe4cc74f7

Change-Id: I69b00aebae95532bf9fe51191b14e12d8948b0bf

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:45:00 +0000 (17:45 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0 am: 5b98c9f4a3

Change-Id: I7c2952f8540db9ee15ceac73bf1a0d73652f5163

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 17:44:58 +0000 (17:44 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in Bluetooth pairing am: ac6c49d2b0

Change-Id: Id8ac4a63bd63d0a219364b520211ebae5ad6ea62

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 17:42:26 +0000 (10:42 -0700)]

commit | commitdiff | tree

Antony Sargent [Thu, 8 Mar 2018 19:42:30 +0000 (19:42 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745
am: 5943908af4 -s ours

Change-Id: I26672d57ced63374a8b03ae3e8e0647c6a4bd150

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:56 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1 skipped: fb6a179745

Change-Id: Ib8ff63887495bec58823610df2bfe993d024bb12

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:53 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1 skipped: ca801490c1

Change-Id: Ife59d44c290cc17fb50bf252e0d5018e694249f4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:50 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9 skipped: 6827142bd1

Change-Id: I2da83a86cf8dce95f26b21c02a426d53f5db5913

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:46 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff skipped: ddd9cb6be9

Change-Id: I43b0b5ebdb708b53d3df284c3f836bec85e6e028

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:44 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861 skipped: 5755ec9bff

Change-Id: I789abf6753a183218b5a5b3497a4496d3e3b937c

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:40 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25 skipped: eb76bf9861

Change-Id: I999690b501e7fc8fb80b1d0d00b3ea325eef4247

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:37 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10 skipped: 59ab695e25

Change-Id: Ib7353cdd97c4da931c3ea3502e40fc72b61c1bb8

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:34 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49 skipped: d923718d10

Change-Id: I04c83c01dd38c7498fdd7ca4b978bab482172801

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Feb 2018 00:43:27 +0000 (00:43 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 0a7ae11c49

Change-Id: I99c6271e133bffb2e78ba1fbfbf34a3e819411a7

commit | commitdiff | tree

Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]

Import translations. DO NOT MERGE

Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I43db31f1495e6873b6905896e6fa75fd88b4cb8d

commit | commitdiff | tree

Bill Yi [Tue, 19 Dec 2017 04:43:20 +0000 (20:43 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306

commit | commitdiff | tree

Bill Yi [Wed, 13 Dec 2017 00:25:18 +0000 (16:25 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1

commit | commitdiff | tree

Bill Yi [Fri, 8 Dec 2017 01:08:40 +0000 (17:08 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 23:10:05 +0000 (23:10 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9
am: 26e5f828f7

Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:36:29 +0000 (17:36 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
am: db6e747ab9

Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
am: acacd658f1

Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
am: 9867a3ef85

Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
am: 3d7dbd6407

Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
am: 24f063a207

Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
am: 9cf1fc73f1

Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
am: eee62e1846

Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]

Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3

Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b

commit | commitdiff | tree

Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]

Reword bluetooth confirmation dialog
am: e14d38a383

Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5

commit | commitdiff | tree

Antony Sargent [Fri, 1 Dec 2017 21:21:38 +0000 (21:21 +0000)]

Fix BluetoothPairingDialogTest to not expect device name
am: f20e0a492b

Change-Id: I4a74ac865db27415b232b0f460b058344adcc0ce

commit | commitdiff | tree

Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02

commit | commitdiff | tree

TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Mon, 20 Nov 2017 19:40:38 +0000 (11:40 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264

commit | commitdiff | tree

Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]

Reword bluetooth confirmation dialog

Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.

Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)

Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1

commit | commitdiff | tree

Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]

Fix BluetoothPairingDialogTest to not expect device name

The functional fix for b/62672248 in ag/2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.

Bug: 62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95

commit | commitdiff | tree

Bill Yi [Tue, 14 Nov 2017 20:42:27 +0000 (12:42 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241

commit | commitdiff | tree

Bill Yi [Tue, 7 Nov 2017 07:21:01 +0000 (23:21 -0800)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e

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)]

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

Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1

commit | commitdiff | tree

Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +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

Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da

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 [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

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)]

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

Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 23:02:45 +0000 (23:02 +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

Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403

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

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

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

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 [Fri, 22 Sep 2017 18:25:42 +0000 (11:25 -0700)]

Set device credential's Window flag to be SECURE.

This prevents showing any pattern/pin in recent list.

Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes: 64339515
Bug: 38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Fan Zhang [Fri, 22 Sep 2017 16:32:02 +0000 (09:32 -0700)]

Set device credential's Window flag to be SECURE.

This prevents showing any pattern/pin in recent list.

Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes: 64339515
Bug: 38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 18:36:12 +0000 (18:36 +0000)]

Merge "Set device credential's Window flag to be SECURE." into oc-dev
am: e3d0bbcc80 -s ours

Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef

commit | commitdiff | tree

Fan Zhang [Tue, 31 Oct 2017 18:25:36 +0000 (18:25 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 03:34:28 +0000 (03:34 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 31 Oct 2017 02:37:43 +0000 (02:37 +0000)]

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

commit | commitdiff | tree

Bill Yi [Tue, 31 Oct 2017 01:16:54 +0000 (18:16 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: If1e768b33481061f37bac9612b862ece348f15fb

commit | commitdiff | tree

Bill Yi [Fri, 27 Oct 2017 04:16:36 +0000 (21:16 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98

commit | commitdiff | tree

Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]

Move color mode to DisplayTransformManager

Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100

Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa

commit | commitdiff | tree

Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]

Add strings to support multi-state vivid color management

Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit e1543a3895a3b0b3af1ac1580b2d5a893ac119a7)

commit | commitdiff | tree

Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170

commit | commitdiff | tree

Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]

Add new color mode setting

Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)

The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).

Bug: 68159303
Test: make RunSettingsRoboTests
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit 05fa18f8474cd5fed798e7ee7ef099682c4a4475)

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5 am: a637e31547 -s ours
am: a00521b3a0

Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3 am: 2a2d92eee8 -s ours
am: a829548c12

Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 5ef2cfac97 -s ours am: 45fc104958 -s ours am: 19fa568b39 am: 2bf724509c am: a954c8c716 am: 91b1cb4b23 -s ours am: 07c4c8efed am: d88820f3f6 am: 629553fb49 am: 397a3555b5
am: a637e31547 -s ours

Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff

commit | commitdiff | tree

Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]

DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: 4cfc684346 -s ours am: 5b2a431787 am: 9ba609cef9 am: c1ebc09ff0 am: fad1e6a315 -s ours am: 416ecb20a3 am: e341fe95bd am: 85cb0b43da am: 8f2a69fad3
am: 2a2d92eee8 -s ours

Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help