OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408...
Felipe Leme [Fri, 9 Jun 2017 22:57:11 +0000 (22:57 +0000)]
Merge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp am: c3f93e120c" into oc-dr1-dev-plus-aosp
am: 3d4ac192a1

Change-Id: I6f618fc7b4dc5065c810e5d940f4bdc9b16675c0

7 years agoMerge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebf...
Hall Liu [Fri, 9 Jun 2017 22:52:20 +0000 (22:52 +0000)]
Merge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1 am: cfbb73bcde" into oc-dr1-dev-plus-aosp
am: 68f1f6dc94

Change-Id: Ic175c6f0fe25e9d9818de84bd8806a1e17980424

7 years agoMerge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14...
Felipe Leme [Fri, 9 Jun 2017 22:49:39 +0000 (22:49 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14b428" into oc-dr1-dev-plus-aosp
am: 583ee227f5

Change-Id: I27bf69e6f175c2721a5943ae48e598223d122e47

7 years agoMerge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e2083...
Todd Lee [Fri, 9 Jun 2017 22:46:34 +0000 (22:46 +0000)]
Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: 216352792e" into oc-dr1-dev-plus-aosp
am: ca99123233

Change-Id: I80d86eef9bb1120a922fedf97759cf10e9a81a5f

7 years agoMerge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e2083...
Todd Lee [Fri, 9 Jun 2017 22:43:58 +0000 (22:43 +0000)]
Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: b9bcc1c66a" into oc-dr1-dev-plus-aosp
am: 62eece544d

Change-Id: I3497cd772267a5464ac9244ac0a76ad66966fbd4

7 years agoMerge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c...
Siyamed Sinir [Fri, 9 Jun 2017 22:40:52 +0000 (22:40 +0000)]
Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: c1801c9a8d" into oc-dr1-dev-plus-aosp
am: 6ec22a12a0

Change-Id: I43c8d47f9dc10a7dd79c4d8a011a096b15910f62

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358...
Siyamed Sinir [Fri, 9 Jun 2017 22:36:09 +0000 (22:36 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: f99e84e4dd
am: a02dcdcebc

Change-Id: I398a879b45a13127c6059986e002f6f4f6eabeea

7 years agoMerge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5...
Svetoslav Ganov [Fri, 9 Jun 2017 22:33:38 +0000 (22:33 +0000)]
Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp
am: 52c76834b4

Change-Id: I8f7f117b98298c9df9b6b5ebc64bef6a61d597d6

7 years agoMerge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:30:19 +0000 (22:30 +0000)]
Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317 am: 984f1be505"

7 years agoMerge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317
Svetoslav Ganov [Fri, 9 Jun 2017 22:28:46 +0000 (22:28 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: fa6b5ac317
am: 984f1be505

Change-Id: If51ba200f9042bdfc6f9d83c5a4122e9f830f48a

7 years agoMerge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:27:07 +0000 (22:27 +0000)]
Merge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp am: c3f93e120c" into oc-dr1-dev-plus-aosp

7 years agoMerge changes from topic 'am-231d306b0fd9428893b0e824a72c78bf'
Android Build Merger (Role) [Fri, 9 Jun 2017 22:26:02 +0000 (22:26 +0000)]
Merge changes from topic 'am-231d306b0fd9428893b0e824a72c78bf'

* changes:
  Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: 308d0dd03c am: f15e4e77f6
  Copy smearing method to BatteryStatsHelper am: 5dad8068e2 am: 5047d7bf7f  -s ours am: 289b74555f  -s ours

7 years agoMerge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into...
Felipe Leme [Fri, 9 Jun 2017 22:26:02 +0000 (22:26 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp
am: c3f93e120c

Change-Id: Iaaf0f43a5d395110633c261e2f73025a284821b7

7 years agoMerge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebf...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:32 +0000 (22:25 +0000)]
Merge "Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1 am: cfbb73bcde" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:08 +0000 (22:25 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408 am: d11e14b428" into oc-dr1-dev-plus-aosp

7 years agoMerge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1
Hall Liu [Fri, 9 Jun 2017 22:24:40 +0000 (22:24 +0000)]
Merge "Update documentation for streaming methods" am: 186a588d57 am: 01604ebfc1
am: cfbb73bcde

Change-Id: Ib841554ba1ad15eceefcbb2ee32599e1087b9f76

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: 308d0dd03c
Lei Yu [Fri, 9 Jun 2017 22:24:20 +0000 (22:24 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: 308d0dd03c
am: f15e4e77f6

Change-Id: I83e8bb805ab7d73f63136133a291ecfeb6d762db

7 years agoMerge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408
Felipe Leme [Fri, 9 Jun 2017 22:24:17 +0000 (22:24 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408
am: d11e14b428

Change-Id: I80bd1592ca2b093e263f2ddfedc174dc401ec567

7 years agoMerge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e2083...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:24:01 +0000 (22:24 +0000)]
Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: 216352792e" into oc-dr1-dev-plus-aosp

7 years agoMerge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e2083...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:23:47 +0000 (22:23 +0000)]
Merge "Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97 am: b9bcc1c66a" into oc-dr1-dev-plus-aosp

7 years agoMerge "Internationalize InputFilter.AllCaps"
Roozbeh Pournader [Fri, 9 Jun 2017 22:23:42 +0000 (22:23 +0000)]
Merge "Internationalize InputFilter.AllCaps"

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394...
Todd Lee [Fri, 9 Jun 2017 22:23:04 +0000 (22:23 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
am: 216352792e

Change-Id: I510d5cd01b7c46ae24347b90154dbdbf09439545

7 years agoCopy smearing method to BatteryStatsHelper am: 5dad8068e2 am: 5047d7bf7f -s ours
jackqdyulei [Fri, 9 Jun 2017 22:22:57 +0000 (22:22 +0000)]
Copy smearing method to BatteryStatsHelper am: 5dad8068e2 am: 5047d7bf7f  -s ours
am: 289b74555f  -s ours

Change-Id: Ibe9dfa5cb8761a176b0ce1c529baa35070d94b50

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394...
Todd Lee [Fri, 9 Jun 2017 22:22:45 +0000 (22:22 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
am: b9bcc1c66a

Change-Id: I4031c0127f4ac9ee87eeb9ae8106f343504085f6

7 years agoMerge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:22:36 +0000 (22:22 +0000)]
Merge "Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358 am: c1801c9a8d" into oc-dr1-dev-plus-aosp

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
Siyamed Sinir [Fri, 9 Jun 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: c1801c9a8d

Change-Id: Iac201ccb8123f114b492fbbe4c6a151b57f6dd27

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
Siyamed Sinir [Fri, 9 Jun 2017 22:20:15 +0000 (22:20 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
am: f99e84e4dd

Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf

7 years agoMerge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:17:09 +0000 (22:17 +0000)]
Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp

7 years agoMerge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
Svetoslav Ganov [Fri, 9 Jun 2017 22:15:07 +0000 (22:15 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
am: 012c7d29d6

Change-Id: Ifbf4fd1083e9bb865fa3a20e5aedec43d1bf5eb5

7 years agoMerge "Minor fix on autofill() javadoc." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 22:13:59 +0000 (22:13 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am: 211e760408

Change-Id: I1dddd4e6a326ccd0fb6f57dbd30b0c4ba0d08106

7 years agoMerge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
Svetoslav Ganov [Fri, 9 Jun 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
am: fa6b5ac317

Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b

7 years agoMerge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into...
Android Build Merger (Role) [Fri, 9 Jun 2017 22:09:28 +0000 (22:09 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: bd499f9319
Lei Yu [Fri, 9 Jun 2017 22:09:24 +0000 (22:09 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859 am: bd499f9319
am: da26705adc

Change-Id: I9ebc48f43c00b8447a4726e4a12be1690b10dd2b

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
Lei Yu [Fri, 9 Jun 2017 22:08:39 +0000 (22:08 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: 308d0dd03c

Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e

7 years agoCopy smearing method to BatteryStatsHelper am: 5dad8068e2 -s ours am: 6d1e7537f3...
jackqdyulei [Fri, 9 Jun 2017 22:08:02 +0000 (22:08 +0000)]
Copy smearing method to BatteryStatsHelper am: 5dad8068e2  -s ours am: 6d1e7537f3  -s ours
am: 7bfcc80251  -s ours

Change-Id: I2d0b35a01e0a3cda7d521e51957c5cc06c4f6bd8

7 years agoCopy smearing method to BatteryStatsHelper am: 5dad8068e2
jackqdyulei [Fri, 9 Jun 2017 22:07:34 +0000 (22:07 +0000)]
Copy smearing method to BatteryStatsHelper am: 5dad8068e2
am: 5047d7bf7f  -s ours

Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5

7 years agoMerge "Minor fix on autofill() javadoc." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 22:07:19 +0000 (22:07 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev
am: 211e760408

Change-Id: Iaea8691ad9d7ce3ff1936f966a780a801e508e1f

7 years agoMerge "Update documentation for streaming methods" am: 186a588d57
Hall Liu [Fri, 9 Jun 2017 22:06:22 +0000 (22:06 +0000)]
Merge "Update documentation for streaming methods" am: 186a588d57
am: 01604ebfc1

Change-Id: Ia7772c9f8b231af0cf48c50c09ec72fa38007df3

7 years agoMerge "Minor fix on autofill() javadoc." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 22:02:40 +0000 (22:02 +0000)]
Merge "Minor fix on autofill() javadoc." into oc-dev

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
Todd Lee [Fri, 9 Jun 2017 22:01:45 +0000 (22:01 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
am: 1b39c88b97

Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
Lei Yu [Fri, 9 Jun 2017 21:59:27 +0000 (21:59 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
am: bd499f9319

Change-Id: I2add2be471c83285f104f137e45a9a8bbb2b8ce7

7 years agoMerge "Update documentation for streaming methods"
Hall Liu [Fri, 9 Jun 2017 21:58:50 +0000 (21:58 +0000)]
Merge "Update documentation for streaming methods"
am: 186a588d57

Change-Id: I44825b99a968b110bb23373d59aa0bb5ecaf7eac

7 years agoCopy smearing method to BatteryStatsHelper am: 5dad8068e2 -s ours
jackqdyulei [Fri, 9 Jun 2017 21:58:06 +0000 (21:58 +0000)]
Copy smearing method to BatteryStatsHelper am: 5dad8068e2  -s ours
am: 6d1e7537f3  -s ours

Change-Id: Iac673806f829a216ce3f7222f9d94fd0aac7d371

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Siyamed Sinir [Fri, 9 Jun 2017 21:56:09 +0000 (21:56 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15

7 years agoMerge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db14...
Felipe Leme [Fri, 9 Jun 2017 21:54:24 +0000 (21:54 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: 6890569c04" into oc-dr1-dev-plus-aosp
am: ee3797a163

Change-Id: Ic77250f3a3ce14168cfe872da38b443f8792ed6b

7 years agoMerge "Protect autofill UI against redressing" into oc-dev
Svetoslav Ganov [Fri, 9 Jun 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac

7 years agoMerge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db14...
Android Build Merger (Role) [Fri, 9 Jun 2017 21:45:31 +0000 (21:45 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: b32c05a36a am: 768bfff308"

7 years agoMerge "Get underline position and thickness from the font"
Roozbeh Pournader [Fri, 9 Jun 2017 21:44:42 +0000 (21:44 +0000)]
Merge "Get underline position and thickness from the font"

7 years agoMerge "Update documentation for streaming methods"
Hall Liu [Fri, 9 Jun 2017 21:44:27 +0000 (21:44 +0000)]
Merge "Update documentation for streaming methods"

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c...
Felipe Leme [Fri, 9 Jun 2017 21:43:56 +0000 (21:43 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: b32c05a36a
am: 768bfff308

Change-Id: Ifaa9318d0103e8c0f75b13668026b7fd7ac53e14

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev
Lei Yu [Fri, 9 Jun 2017 21:42:25 +0000 (21:42 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046

7 years agoCopy smearing method to BatteryStatsHelper
jackqdyulei [Fri, 9 Jun 2017 21:41:14 +0000 (21:41 +0000)]
Copy smearing method to BatteryStatsHelper
am: 5dad8068e2  -s ours

Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
Todd Lee [Fri, 9 Jun 2017 21:40:05 +0000 (21:40 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
am: 1b39c88b97

Change-Id: Ib1de633f27978fd6b87606b44b45c3ac71bc2113

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Siyamed Sinir [Fri, 9 Jun 2017 21:37:17 +0000 (21:37 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 21:35:58 +0000 (21:35 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: d66af648c2
am: cb334c7d33

Change-Id: I74ec7f54702297a95c6239a9c30ae866bf01e021

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3...
Chen Xu [Fri, 9 Jun 2017 21:32:45 +0000 (21:32 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: 25c1a060bc
am: efd4097848

Change-Id: I23d06da1724e03b6f7daf06f22d776e5fb69af4b

7 years agoMerge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db14...
Android Build Merger (Role) [Fri, 9 Jun 2017 21:32:14 +0000 (21:32 +0000)]
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: 6890569c04" into oc-dr1-dev-plus-aosp

7 years agoMerge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updat...
Felipe Leme [Fri, 9 Jun 2017 21:30:31 +0000 (21:30 +0000)]
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp
am: 18de66783a

Change-Id: Ia323d2afd97c97d72f1207a3d37a8989d1098a2c

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
Felipe Leme [Fri, 9 Jun 2017 21:28:01 +0000 (21:28 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: 6890569c04

Change-Id: I8a2985107086b53b450137502e32f07dd5229f6c

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
Felipe Leme [Fri, 9 Jun 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
am: b32c05a36a

Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5

7 years agoMerge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:...
Chen Xu [Fri, 9 Jun 2017 21:27:31 +0000 (21:27 +0000)]
Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp
am: 385f581ffd

Change-Id: I745d3213d8db86dad2a9779f5c51b6c1ed463719

7 years agoMerge "Protect autofill UI against redressing" into oc-dev
Svetoslav Ganov [Fri, 9 Jun 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev
am: 0541862ec5

Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574 am: e2ac2e20d6
Hemant Gupta [Fri, 9 Jun 2017 21:20:18 +0000 (21:20 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574 am: e2ac2e20d6
am: afc9832a1d

Change-Id: Ifb8c22cdb936a76d1a9408228375461909c95369

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 21:20:09 +0000 (21:20 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: d66af648c2

Change-Id: I6317c298d0340cb283e5cdc9b7ec70a7d3fe8e8f

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev
Lei Yu [Fri, 9 Jun 2017 21:17:14 +0000 (21:17 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev
am: 883db32859

Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9

7 years agoAdd missing values for screen percent width dimens am: 5fc6653ea7
Todd Lee [Fri, 9 Jun 2017 21:16:04 +0000 (21:16 +0000)]
Add missing values for screen percent width dimens am: 5fc6653ea7
am: a58e208394

Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1

7 years agoCopy smearing method to BatteryStatsHelper
jackqdyulei [Fri, 9 Jun 2017 21:15:56 +0000 (21:15 +0000)]
Copy smearing method to BatteryStatsHelper
am: 5dad8068e2

Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d

7 years agoMerge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours...
Jordan Liu [Fri, 9 Jun 2017 21:14:11 +0000 (21:14 +0000)]
Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090  -s ours" into oc-dr1-dev-plus-aosp
am: 51fb4488f5  -s ours

Change-Id: I05a157e758009cbc261f08cf5f492111e2b2de2e

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
Chen Xu [Fri, 9 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: 25c1a060bc

Change-Id: I2f400e951b3e1f7cc5fc1ac1548a09c3ae65da7b

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 21:12:03 +0000 (21:12 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a

7 years agoMerge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updat...
Android Build Merger (Role) [Fri, 9 Jun 2017 21:10:19 +0000 (21:10 +0000)]
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 21:09:29 +0000 (21:09 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
am: 0425f9ceea

Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9

7 years agoMerge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am:...
Android Build Merger (Role) [Fri, 9 Jun 2017 21:08:59 +0000 (21:08 +0000)]
Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574 am: b99484cc61
Hemant Gupta [Fri, 9 Jun 2017 21:07:38 +0000 (21:07 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574 am: b99484cc61
am: 3f6bb65808

Change-Id: I4b05ce913154888e14a2d4940cf9836a79ee89b6

7 years agoAdd missing values for screen percent width dimens
Todd Lee [Fri, 9 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Add missing values for screen percent width dimens
am: 5fc6653ea7

Change-Id: Icecf451c5cb97275234f75f55292729a5f213560

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
Chen Xu [Fri, 9 Jun 2017 21:06:48 +0000 (21:06 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
am: fce339c49c

Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
Hemant Gupta [Fri, 9 Jun 2017 21:06:09 +0000 (21:06 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: e2ac2e20d6

Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 21:05:39 +0000 (21:05 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
am: 8db148093c

Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 21:03:27 +0000 (21:03 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4

Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5

7 years agoMerge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours...
Android Build Merger (Role) [Fri, 9 Jun 2017 21:02:45 +0000 (21:02 +0000)]
Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090  -s ours" into oc-dr1-dev-plus-aosp

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Chen Xu [Fri, 9 Jun 2017 21:00:26 +0000 (21:00 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
Hemant Gupta [Fri, 9 Jun 2017 21:00:03 +0000 (21:00 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
am: b99484cc61

Change-Id: I701377a315a73eb918f8e42129a401072733cb71

7 years agoMerge "Add IApnSourceService.aidl" into oc-dr1-dev
Jordan Liu [Fri, 9 Jun 2017 20:59:54 +0000 (20:59 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
am: 49444fc090  -s ours

Change-Id: Id3b02a2cbcbcaa1bda5cf3515f9b33642afdb96d

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 20:59:53 +0000 (20:59 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
am: e4835a2af4

Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a

7 years agoMerge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
Siyamed Sinir [Fri, 9 Jun 2017 20:58:30 +0000 (20:58 +0000)]
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2
Hemant Gupta [Fri, 9 Jun 2017 20:57:41 +0000 (20:57 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Chen Xu [Fri, 9 Jun 2017 20:57:02 +0000 (20:57 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
am: cdec393aa3

Change-Id: I657161b898c66efdf13c48c322e25cefc7733750

7 years agoMerge "Add IApnSourceService.aidl" into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 20:54:19 +0000 (20:54 +0000)]
Merge "Add IApnSourceService.aidl" into oc-dr1-dev

7 years agoMerge "Protect autofill UI against redressing" into oc-dev
Svetoslav Ganov [Fri, 9 Jun 2017 20:53:26 +0000 (20:53 +0000)]
Merge "Protect autofill UI against redressing" into oc-dev

7 years agoMerge changes from topic 'battery_smear_move' into oc-dev
Lei Yu [Fri, 9 Jun 2017 20:50:36 +0000 (20:50 +0000)]
Merge changes from topic 'battery_smear_move' into oc-dev

* changes:
  Batterystats logs smeared power model values
  Copy smearing method to BatteryStatsHelper

7 years agoOBEX: Add required parameters TAG ID's for PBAP 1.2
Hemant Gupta [Fri, 9 Jun 2017 20:50:16 +0000 (20:50 +0000)]
OBEX: Add required parameters TAG ID's for PBAP 1.2
am: 6f2b75f574

Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69

7 years agoMerge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev am: c017d299ce
Jeff Sharkey [Fri, 9 Jun 2017 20:37:38 +0000 (20:37 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev am: c017d299ce
am: 00c66f676f

Change-Id: I200f39ef3dd3c336abd48e53a9b93e21f48a7dc0

7 years agoMerge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
Jeff Sharkey [Fri, 9 Jun 2017 20:29:11 +0000 (20:29 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
am: c017d299ce

Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c

7 years agoMerge "Enables child APKs, fixes a package parsing bug, and adds tests."
Garry Boyer [Fri, 9 Jun 2017 20:25:42 +0000 (20:25 +0000)]
Merge "Enables child APKs, fixes a package parsing bug, and adds tests."

7 years agoMerge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
Jeff Sharkey [Fri, 9 Jun 2017 20:23:14 +0000 (20:23 +0000)]
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev

7 years agoMerge "Add IApnSourceService.aidl" am: 1d5d409f6f am: 7b78a176a9 am: b699e98285
Jordan Liu [Fri, 9 Jun 2017 20:08:42 +0000 (20:08 +0000)]
Merge "Add IApnSourceService.aidl" am: 1d5d409f6f am: 7b78a176a9 am: b699e98285
am: da7fe3f117  -s ours

Change-Id: I7ccd76d80556dd76626e429a868f6b32f19e3fb9

7 years agoMerge "Closes Autofill UIs when back button is pressed." into oc-dev
Felipe Leme [Fri, 9 Jun 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Closes Autofill UIs when back button is pressed." into oc-dev

7 years agoMerge "Ignore dispatchProvideStructureForAutofill() when layout is being updated...
Felipe Leme [Fri, 9 Jun 2017 19:42:13 +0000 (19:42 +0000)]
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev

7 years agoMerge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev

7 years agoAdd missing values for screen percent width dimens
Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]
Add missing values for screen percent width dimens

Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.

Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).

bug: b/37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b