OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6...
Jonathan Basseri [Wed, 2 Aug 2017 02:17:23 +0000 (02:17 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6 am: aaeca1e977 am: 89a2a41572
am: ab7c6a22a9

Change-Id: I2068039632b86f24b00b733151741b324cf6d4c9

6 years agoMerge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6...
Jonathan Basseri [Wed, 2 Aug 2017 02:07:20 +0000 (02:07 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6 am: aaeca1e977
am: 89a2a41572

Change-Id: I55d117ed2e61cd54b9e64034b0e5df8be00ce9e6

6 years agoMerge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
Jonathan Basseri [Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
am: aaeca1e977

Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a

6 years agoMerge "Add test for InputMethodSubtypePreference"
Tadashi G. Takaoka [Wed, 2 Aug 2017 01:36:33 +0000 (01:36 +0000)]
Merge "Add test for InputMethodSubtypePreference"

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences."
TreeHugger Robot [Wed, 2 Aug 2017 01:23:52 +0000 (01:23 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."

6 years agoMerge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into...
Felipe Leme [Wed, 2 Aug 2017 01:19:24 +0000 (01:19 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours" into oc-mr1-dev am: 0a0bc5f89d  -s ours
am: 1f583d65bf  -s ours

Change-Id: I683b81238d8e6e25034f55bc0a126810e0057621

6 years agoMerge "Make a11y shortcut dialog themeable" into oc-mr1-dev am: cdb70789d7
Phil Weaver [Wed, 2 Aug 2017 01:12:49 +0000 (01:12 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev am: cdb70789d7
am: 256a31e25b

Change-Id: Ibf0a6b4f206978c48932c0d55a8dea9ac3bc1a60

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 01:02:14 +0000 (01:02 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours am: dd187f4a82  -s ours
am: daa88a8287  -s ours

Change-Id: I65256881e1ddcd602f22ddd84b494c44e3c6ee39

6 years agoMerge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into...
Felipe Leme [Wed, 2 Aug 2017 01:00:22 +0000 (01:00 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours" into oc-mr1-dev
am: 0a0bc5f89d  -s ours

Change-Id: I9285c5fd38a0ecd532e69d20baa29e54e18ec93e

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:59:22 +0000 (00:59 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2 am: 4e051d9da9  -s ours
am: b2abf99244  -s ours

Change-Id: Id926a99ec7d6868f042b41b38fbf8dbbb4d6aa74

6 years agoMerge "Make a11y shortcut dialog themeable" into oc-mr1-dev
Phil Weaver [Wed, 2 Aug 2017 00:55:44 +0000 (00:55 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
am: cdb70789d7

Change-Id: I9e53821d1cc2666187fd28f05203742c5325381e

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:51:45 +0000 (00:51 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours
am: dd187f4a82  -s ours

Change-Id: I66774912fda7acd0259644b45c40fd8d94086626

6 years agoMerge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into...
Android Build Merger (Role) [Wed, 2 Aug 2017 00:47:17 +0000 (00:47 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours" into oc-mr1-dev

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:44:17 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2
am: 4e051d9da9  -s ours

Change-Id: I31751578bdf17a66f0abae25375b14ce22a8cddb

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:44:00 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2  -s ours

Change-Id: I44079cc5dec0f7c513370ae9effdcd93180da38c

6 years agoMerge "Make a11y shortcut dialog themeable" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 00:43:41 +0000 (00:43 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2  -s ours

Change-Id: I4e65c04b63813ef95ec8bb99e783dfe223ca7a5a

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:35:44 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2

Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16

6 years agoMerge "Remove obsolete comment"
Seigo Nonaka [Wed, 2 Aug 2017 00:29:48 +0000 (00:29 +0000)]
Merge "Remove obsolete comment"

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev
Felipe Leme [Wed, 2 Aug 2017 00:26:37 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am: 6829a1dace

Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev

6 years agoMerge "Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: 8bf1f86606...
Sundeep Ghuman [Tue, 1 Aug 2017 23:29:55 +0000 (23:29 +0000)]
Merge "Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: 8bf1f86606" into oc-mr1-dev-plus-aosp
am: 5a85d6039c

Change-Id: I292ed821510027f87b01a21c7cffd8e427318e6b

6 years agoMerge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: dbb97833c6
Sundeep Ghuman [Tue, 1 Aug 2017 23:26:39 +0000 (23:26 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: dbb97833c6
am: 4150fbacc8

Change-Id: I5098e205386b3f25e8bb573115fdec14654d9bdd

6 years agoMerge "Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: 8bf1f86606...
Android Build Merger (Role) [Tue, 1 Aug 2017 23:21:07 +0000 (23:21 +0000)]
Merge "Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f am: 8bf1f86606" into oc-mr1-dev-plus-aosp

6 years agoMerge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
Sundeep Ghuman [Tue, 1 Aug 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
am: 8bf1f86606

Change-Id: I62028bca21ddcb1cdd2f9574615490c795a8cbd3

6 years agoMerge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
Sundeep Ghuman [Tue, 1 Aug 2017 23:15:30 +0000 (23:15 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev am: a048e3c03f
am: dbb97833c6

Change-Id: I46bbc7f6d9d4f4238a2d528abc88d2a87fd25f74

6 years agoMerge "Fix broken robotests." into oc-dr1-dev
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:07 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am: a048e3c03f

Change-Id: If07fc6d27b94cd515f2b205ab2cd77bd84302942

6 years agoMerge "Fix broken robotests." into oc-dr1-dev
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:04 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am: a048e3c03f

Change-Id: I35b3b811fed79b3aafef063df907dddcdc736ecd

6 years agoMerge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8
Jonathan Basseri [Tue, 1 Aug 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8
am: 02cc8151a6

Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500

6 years agoMerge "Fix broken robotests." into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev

6 years agoMerge "Fix EditText cursor when line spacing is set"
Siyamed Sinir [Tue, 1 Aug 2017 22:37:55 +0000 (22:37 +0000)]
Merge "Fix EditText cursor when line spacing is set"

6 years agoMerge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b

6 years agoMerge "Move getNetworkCountryIso impl from TM to PIM."
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c4...
Selim Cinek [Tue, 1 Aug 2017 22:25:24 +0000 (22:25 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46 am: 0bd1f34c47
am: 76f4dd767b

Change-Id: Ide7d5d3aedaf4284f7b16df1d07149cd7aec5a2d

6 years agoMove getNetworkCountryIso impl from TM to PIM.
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.

This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c4...
Selim Cinek [Tue, 1 Aug 2017 22:18:27 +0000 (22:18 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46 am: 61029fb091
am: 6359dcd7fb

Change-Id: Ic15d15ed1750fc85cdbd3176ba0e1bb087c66dde

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46
Selim Cinek [Tue, 1 Aug 2017 22:13:44 +0000 (22:13 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46
am: 0bd1f34c47

Change-Id: Iffdde7a0d291a3eac2d7442273b8bf1b2b7e0346

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46
Selim Cinek [Tue, 1 Aug 2017 22:06:10 +0000 (22:06 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev am: bbd9264c46
am: 61029fb091

Change-Id: I360bce398225ee78979a50e8a89c71f7e9506b82

6 years agoMerge "Merge "docs: Noted that JobIntentService is usually a better choice" into...
Andrew Solovay [Tue, 1 Aug 2017 22:03:32 +0000 (22:03 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc" into oc-dr1-dev-plus-aosp am: ce4d45e399
am: 97d49c65ad

Change-Id: Ic8c25df8a7686551100edde91df17b944983ded0

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
Selim Cinek [Tue, 1 Aug 2017 21:58:35 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am: bbd9264c46

Change-Id: I7794e3dc60fb6379b1c3c3c7400be61e45c9a301

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
Selim Cinek [Tue, 1 Aug 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am: bbd9264c46

Change-Id: I0e0d6fac50335a93b5ee15af75096d7db0389a70

6 years agoMerge "Merge "docs: Noted that JobIntentService is usually a better choice" into...
Andrew Solovay [Tue, 1 Aug 2017 21:53:53 +0000 (21:53 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: d4b1a0985b am: 517927fa1a" into oc-mr1-dev-plus-aosp
am: 7f218c3a7b

Change-Id: I597c714d81db2e8f51b9bf803a002d21fe7143c3

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev...
Andrew Solovay [Tue, 1 Aug 2017 21:48:14 +0000 (21:48 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc am: 6ff61dbc51
am: 49f6afe2f8

Change-Id: I0fd57ed371ae915ee33aa77e198b17eb9e9c8df9

6 years agoMerge "Merge "docs: Noted that JobIntentService is usually a better choice" into...
Andrew Solovay [Tue, 1 Aug 2017 21:46:46 +0000 (21:46 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc" into oc-dr1-dev-plus-aosp
am: ce4d45e399

Change-Id: I64fd78a2730cdb2565c56bdf75938029f4c3df75

6 years agoMerge "Merge "docs: Noted that JobIntentService is usually a better choice" into...
Android Build Merger (Role) [Tue, 1 Aug 2017 21:43:41 +0000 (21:43 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: d4b1a0985b am: 517927fa1a" into oc-mr1-dev-plus-aosp

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev...
Andrew Solovay [Tue, 1 Aug 2017 21:39:34 +0000 (21:39 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: d4b1a0985b
am: 517927fa1a

Change-Id: I0c4515a1abd0d58b81fd0d4090a609507436ee4c

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev...
Andrew Solovay [Tue, 1 Aug 2017 21:39:26 +0000 (21:39 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc
am: 6ff61dbc51

Change-Id: I641281f7430fe2d9c168bf2eddbdcba6803dff96

6 years agoMerge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 21:37:00 +0000 (21:37 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev

6 years agoMerge "Merge "docs: Noted that JobIntentService is usually a better choice" into...
Android Build Merger (Role) [Tue, 1 Aug 2017 21:35:01 +0000 (21:35 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc" into oc-dr1-dev-plus-aosp

6 years agoMerge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847 am: e6a08439b6...
Ruchi Kandoi [Tue, 1 Aug 2017 21:32:53 +0000 (21:32 +0000)]
Merge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847 am: e6a08439b6 am: 49dc055ae6
am: 93339c9ab9

Change-Id: I096f4c1b232456b3ec5f311b366cd91d817c43dc

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev...
Andrew Solovay [Tue, 1 Aug 2017 21:32:05 +0000 (21:32 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: 9e1b7759dc

Change-Id: Ief80079e0cda4aca334f513409c43feae3d34b28

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev...
Andrew Solovay [Tue, 1 Aug 2017 21:31:59 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: 9e1b7759dc

Change-Id: I9b6e9c02f2237c48fdac4fd6f0c4afc4eb8b03cd

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev...
Andrew Solovay [Tue, 1 Aug 2017 21:31:58 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: d4b1a0985b

Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4

6 years agoRemove obsolete comment
Seigo Nonaka [Tue, 1 Aug 2017 21:24:28 +0000 (14:24 -0700)]
Remove obsolete comment

Bug: 11750374
Test: N/A
Change-Id: I50a264f01ff04c87a4b86f80fb38ec69d30d3241

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Andrew Solovay [Tue, 1 Aug 2017 21:21:58 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am: d71cc3b72e

Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Andrew Solovay [Tue, 1 Aug 2017 21:21:01 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am: d71cc3b72e

Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04

6 years agoMerge "Volume slider content description" into oc-mr1-dev am: 34c949d2dc
Lucas Dupin [Tue, 1 Aug 2017 21:16:36 +0000 (21:16 +0000)]
Merge "Volume slider content description" into oc-mr1-dev am: 34c949d2dc
am: dbcd84452f

Change-Id: I6f21b047d32787af75d061e841e9bd9fbe7c8f7a

6 years agoMerge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847 am: e6a08439b6
Ruchi Kandoi [Tue, 1 Aug 2017 21:14:12 +0000 (21:14 +0000)]
Merge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847 am: e6a08439b6
am: 49dc055ae6

Change-Id: I7ea323c190ee7535575b5dde82ebdc7a8234b0db

6 years agoMerge "Add new Dolby Vision Profile types" into oc-mr1-dev am: 2ca4449d6b
Previr Rangroo [Tue, 1 Aug 2017 21:07:50 +0000 (21:07 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev am: 2ca4449d6b
am: 20efa0bce6

Change-Id: I3394825fb00c3409142c10c88fe44d2a622ece6f

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev

6 years agoMerge "Volume slider content description" into oc-mr1-dev
Lucas Dupin [Tue, 1 Aug 2017 21:04:39 +0000 (21:04 +0000)]
Merge "Volume slider content description" into oc-mr1-dev
am: 34c949d2dc

Change-Id: I2acce419f4fb34a0b2d9ae46680c4acbbad60668

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d am: 1ce17014ce
Love Khanna [Tue, 1 Aug 2017 21:01:49 +0000 (21:01 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d am: 1ce17014ce
am: c292478022

Change-Id: If59a66ad9a95c2fd8c3ff0ee9fb96c16db304778

6 years agoMerge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847
Ruchi Kandoi [Tue, 1 Aug 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847
am: e6a08439b6

Change-Id: I80df7df67afa1e9a7dd4071d3005ef2e1ed0c004

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()" into oc...
Dianne Hackborn [Tue, 1 Aug 2017 20:58:43 +0000 (20:58 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()" into oc-mr1-dev am: 47e6cc34bb
am: e4a04e87d1

Change-Id: I16ef18b31ad25254dd2009a04ffc7e532d5e2694

6 years agoMake a11y shortcut dialog themeable
Phil Weaver [Fri, 28 Jul 2017 19:58:15 +0000 (12:58 -0700)]
Make a11y shortcut dialog themeable

Bug: 64145430
Test: Brought up dialog. It's now blue.
Change-Id: Ib830734da43001260628133c05f3f3faee9c1563
(cherry picked from commit 5351872f4f033badbb176b273e38afb5d33b35b8)

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 20:55:07 +0000 (20:55 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5 am: 537c9c407e
am: 978e096dd2

Change-Id: Iecb2301ac299e06f16429dfae5f422c0956d834d

6 years agoMerge "Set default value for T3T_PMM." am: 7770adf755
Ruchi Kandoi [Tue, 1 Aug 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Set default value for T3T_PMM." am: 7770adf755
am: 1decea7847

Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef

6 years agoMerge "Volume slider content description" into oc-mr1-dev
Lucas Dupin [Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Volume slider content description" into oc-mr1-dev

6 years agoMerge "Add new Dolby Vision Profile types" into oc-mr1-dev
Previr Rangroo [Tue, 1 Aug 2017 20:49:18 +0000 (20:49 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
am: 2ca4449d6b

Change-Id: I164e07c43d0538835759e734cea871503431ceb9

6 years agoMerge "Make a11y shortcut dialog themeable"
TreeHugger Robot [Tue, 1 Aug 2017 20:48:28 +0000 (20:48 +0000)]
Merge "Make a11y shortcut dialog themeable"

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d am: 7d8f6ab8e1
Love Khanna [Tue, 1 Aug 2017 20:41:42 +0000 (20:41 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d am: 7d8f6ab8e1
am: 3eff94470f

Change-Id: Ia5ad2951ece66b44c6f065d76d9b9fbf3bceb109

6 years agoMerge "Set default value for T3T_PMM."
Ruchi Kandoi [Tue, 1 Aug 2017 20:40:33 +0000 (20:40 +0000)]
Merge "Set default value for T3T_PMM."
am: 7770adf755

Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc

6 years agoMerge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08c...
Jason Monk [Tue, 1 Aug 2017 20:37:40 +0000 (20:37 +0000)]
Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d am: d789b7b99f" into oc-mr1-dev-plus-aosp
am: ad0a8267ae

Change-Id: I4a4c6ce14d1d9f25cc072bc4e5317b478dc0c75b

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d
Love Khanna [Tue, 1 Aug 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d
am: 1ce17014ce

Change-Id: I2171884ee232c3a94e9f764a516dcb1e302789fc

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5 am: 06a108c297
am: 2271967c96

Change-Id: Ib48ecd5965c8a68806b807c4919cd4a0b4ed5014

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()" into oc...
Dianne Hackborn [Tue, 1 Aug 2017 20:32:19 +0000 (20:32 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()" into oc-mr1-dev
am: 47e6cc34bb

Change-Id: I8777f2dc71392fadfce534b1323e0f8ec8601427

6 years agoMerge "Add new Dolby Vision Profile types" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 20:31:01 +0000 (20:31 +0000)]
Merge "Add new Dolby Vision Profile types" into oc-mr1-dev

6 years agoMerge "Set default value for T3T_PMM."
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 20:27:07 +0000 (20:27 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5
am: 537c9c407e

Change-Id: Icf80d49a1541f57afcf77d4e7a59771f485ad47b

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d
Love Khanna [Tue, 1 Aug 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d
am: 7d8f6ab8e1

Change-Id: Ibb31cfee564cb74b23fdd2fd613829209e600500

6 years agoMerge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d...
Jason Monk [Tue, 1 Aug 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d am: 29b1a86af3
am: 8a36711334

Change-Id: I78a1446dd91cf19db9a866e12d4dccebac7bf684

6 years agoMerge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08c...
Android Build Merger (Role) [Tue, 1 Aug 2017 20:16:06 +0000 (20:16 +0000)]
Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d am: d789b7b99f" into oc-mr1-dev-plus-aosp

6 years agoMerge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
Jason Monk [Tue, 1 Aug 2017 20:12:44 +0000 (20:12 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
am: d789b7b99f

Change-Id: I1797d5fb9806f403ca113774382ed94d28f78f5d

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5
am: 06a108c297

Change-Id: I45139ffa0da676ed80147f474d757600b725f585

6 years agoMerge "Log package parse timings" into oc-mr1-dev am: cd0d29e9fc
Fyodor Kupolov [Tue, 1 Aug 2017 20:08:32 +0000 (20:08 +0000)]
Merge "Log package parse timings" into oc-mr1-dev am: cd0d29e9fc
am: 7881a63734

Change-Id: I45d395d6830c25702797068e14e2341a4e250326

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev
Love Khanna [Tue, 1 Aug 2017 20:07:57 +0000 (20:07 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d

Change-Id: If491a922902bc18d282e4c3c3b4a689d78eac897

6 years agoMerge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
Jason Monk [Tue, 1 Aug 2017 20:07:56 +0000 (20:07 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
am: 29b1a86af3

Change-Id: Ieace05c849161fefa9e911968c3306f93e65aea3

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev
Love Khanna [Tue, 1 Aug 2017 20:03:44 +0000 (20:03 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d

Change-Id: Idf050b3f7a144a5074b33677269305d9eadd312d

6 years agoMerge "Fix issue #64224738: Document return value of IBinder.transact()" into oc...
Dianne Hackborn [Tue, 1 Aug 2017 20:01:32 +0000 (20:01 +0000)]
Merge "Fix issue #64224738: Document return value of IBinder.transact()" into oc-mr1-dev

6 years agoMerge "Merge "Minor Autofill javadoc fix." into oc-mr1-dev am: 7fecc73f52 am: 06b841a11f"
Android Build Merger (Role) [Tue, 1 Aug 2017 19:59:07 +0000 (19:59 +0000)]
Merge "Merge "Minor Autofill javadoc fix." into oc-mr1-dev am: 7fecc73f52 am: 06b841a11f"

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 19:57:28 +0000 (19:57 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am: 0151c395b5

Change-Id: I027d106b11eb23bc056451c65cb89266cfea12e1

6 years agoMerge "Minor Autofill javadoc fix." into oc-mr1-dev am: 7fecc73f52
Felipe Leme [Tue, 1 Aug 2017 19:56:23 +0000 (19:56 +0000)]
Merge "Minor Autofill javadoc fix." into oc-mr1-dev am: 7fecc73f52
am: 06b841a11f

Change-Id: Ie9357578dfa09cb05c27dff78949222ad9796d2d

6 years agoMerge "AAPT2: Ensure style strings are always first in StringPool"
Adam Lesinski [Tue, 1 Aug 2017 19:56:09 +0000 (19:56 +0000)]
Merge "AAPT2: Ensure style strings are always first in StringPool"

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 19:56:04 +0000 (19:56 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am: 0151c395b5

Change-Id: I2ae775926cdd52e2e0fb00cd2c2fb2b7dc92e863

6 years agoMerge "Make it easier to click on phone nav buttons" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 19:53:00 +0000 (19:53 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: Id345173efdfb2ceed7449680ad9d9c252fbf8be2

6 years agoMerge "Make it easier to click on phone nav buttons" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 19:52:08 +0000 (19:52 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: I8e2c578cb564b2bc2de7c793eb40dea2639fa04e

6 years agoMerge "Log package parse timings" into oc-mr1-dev
Fyodor Kupolov [Tue, 1 Aug 2017 19:51:22 +0000 (19:51 +0000)]
Merge "Log package parse timings" into oc-mr1-dev
am: cd0d29e9fc

Change-Id: I5f0a4cffef76cc0b5124791009bd96e0a9078d3e

6 years agoMerge "Set default value for T3T_PMM." into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 19:48:12 +0000 (19:48 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev

6 years agoMerge "Log package parse timings" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 19:46:29 +0000 (19:46 +0000)]
Merge "Log package parse timings" into oc-mr1-dev

6 years agoMerge "Revert "Fixing occasional jump when launching certain apps from Recents."...
Adam Cohen [Tue, 1 Aug 2017 19:41:42 +0000 (19:41 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev