Todd Lee
a8b60d253c
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394 am: 1b39c88b97
...
am: b9bcc1c66a
Change-Id: I4031c0127f4ac9ee87eeb9ae8106f343504085f6
2017-06-09 22:22:45 +00:00
Siyamed Sinir
a02dcdcebc
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev am: bc626c6358
...
am: f99e84e4dd
Change-Id: I04a26678d8df05ea59bcec48061f027b0b567baf
2017-06-09 22:20:15 +00:00
Android Build Merger (Role)
52c76834b4
Merge "Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5 am: 012c7d29d6" into oc-dr1-dev-plus-aosp
2017-06-09 22:17:15 +00:00
Svetoslav Ganov
edf493c8bd
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
...
am: 012c7d29d6
Change-Id: Ifbf4fd1083e9bb865fa3a20e5aedec43d1bf5eb5
2017-06-09 22:15:07 +00:00
Svetoslav Ganov
984f1be505
Merge "Protect autofill UI against redressing" into oc-dev am: 0541862ec5
...
am: fa6b5ac317
Change-Id: Idca89686865f91cf2c3a0af895456e865ca4d90b
2017-06-09 22:13:37 +00:00
Lei Yu
f15e4e77f6
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
...
am: 308d0dd03c
Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e
2017-06-09 22:08:39 +00:00
jackqdyulei
289b74555f
Copy smearing method to BatteryStatsHelper am: 5dad8068e2
...
am: 5047d7bf7f -s ours
Change-Id: Ie76637f4bfc0bf23b5d74ba9688a03fba795cca5
2017-06-09 22:07:34 +00:00
Todd Lee
b9bcc1c66a
Add missing values for screen percent width dimens am: 5fc6653ea7 am: a58e208394
...
am: 1b39c88b97
Change-Id: I62c0a5776bf6307d8d9e580b7d5592352e2efdc8
2017-06-09 22:01:45 +00:00
Lei Yu
da26705adc
Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
...
am: bd499f9319
Change-Id: I2add2be471c83285f104f137e45a9a8bbb2b8ce7
2017-06-09 21:59:27 +00:00
jackqdyulei
7bfcc80251
Copy smearing method to BatteryStatsHelper am: 5dad8068e2 -s ours
...
am: 6d1e7537f3 -s ours
Change-Id: Iac673806f829a216ce3f7222f9d94fd0aac7d371
2017-06-09 21:58:06 +00:00
Siyamed Sinir
f99e84e4dd
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
...
am: bc626c6358
Change-Id: I4d3cff4bf6a0403f311011709c3074bca532de15
2017-06-09 21:56:09 +00:00
Svetoslav Ganov
012c7d29d6
Merge "Protect autofill UI against redressing" into oc-dev
...
am: 0541862ec5
Change-Id: I07b91f8baa721b58f7f0ff9bf90a29481fdedaac
2017-06-09 21:49:49 +00:00
Lei Yu
bd499f9319
Merge changes from topic 'battery_smear_move' into oc-dev
...
am: 883db32859
Change-Id: I45d4eaadbc992663b3453b52c391d5d4d660e046
2017-06-09 21:42:25 +00:00
jackqdyulei
6d1e7537f3
Copy smearing method to BatteryStatsHelper
...
am: 5dad8068e2 -s ours
Change-Id: I07d9a563f224d739e734af92ae5078d8c6f41100
2017-06-09 21:41:14 +00:00
Android Build Merger (Role)
ee3797a163
Merge "Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c am: 6890569c04" into oc-dr1-dev-plus-aosp
2017-06-09 21:32:22 +00:00
Felipe Leme
66aea0de16
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
...
am: 6890569c04
Change-Id: I8a2985107086b53b450137502e32f07dd5229f6c
2017-06-09 21:28:01 +00:00
Felipe Leme
768bfff308
Merge "Closes Autofill UIs when back button is pressed." into oc-dev am: 8db148093c
...
am: b32c05a36a
Change-Id: I69f9a67ae35a2f8e3ae9982531e391ea8a5b49e5
2017-06-09 21:27:48 +00:00
Svetoslav Ganov
fa6b5ac317
Merge "Protect autofill UI against redressing" into oc-dev
...
am: 0541862ec5
Change-Id: I0073d1eb75fc3460ad126ad08b9d4cf3f566a305
2017-06-09 21:25:58 +00:00
Felipe Leme
cb334c7d33
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
...
am: d66af648c2
Change-Id: I6317c298d0340cb283e5cdc9b7ec70a7d3fe8e8f
2017-06-09 21:20:09 +00:00
Lei Yu
308d0dd03c
Merge changes from topic 'battery_smear_move' into oc-dev
...
am: 883db32859
Change-Id: Ibb862780286006efb4a4a117f007cc652dac4ce9
2017-06-09 21:17:14 +00:00
Todd Lee
1b39c88b97
Add missing values for screen percent width dimens am: 5fc6653ea7
...
am: a58e208394
Change-Id: I0bd6a5e8fe67439d823068229f4bbd828560d7c1
2017-06-09 21:16:04 +00:00
jackqdyulei
5047d7bf7f
Copy smearing method to BatteryStatsHelper
...
am: 5dad8068e2
Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d
2017-06-09 21:15:56 +00:00
Chen Xu
efd4097848
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
...
am: 25c1a060bc
Change-Id: I2f400e951b3e1f7cc5fc1ac1548a09c3ae65da7b
2017-06-09 21:14:02 +00:00
Felipe Leme
6890569c04
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
...
am: 8db148093c
Change-Id: I966af17b26d67f7f29290ee73053e1b833a6623a
2017-06-09 21:12:03 +00:00
Android Build Merger (Role)
18de66783a
Merge "Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4 am: 0425f9ceea" into oc-dr1-dev-plus-aosp
2017-06-09 21:10:24 +00:00
Felipe Leme
c24fa30b51
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev am: e4835a2af4
...
am: 0425f9ceea
Change-Id: I3f817a83fcbda052ba3ca65fb539a7d77ec8d6a9
2017-06-09 21:09:29 +00:00
Android Build Merger (Role)
385f581ffd
Merge "Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3 am: fce339c49c" into oc-dr1-dev-plus-aosp
2017-06-09 21:09:04 +00:00
Todd Lee
a58e208394
Add missing values for screen percent width dimens
...
am: 5fc6653ea7
Change-Id: Icecf451c5cb97275234f75f55292729a5f213560
2017-06-09 21:07:04 +00:00
Chen Xu
5d9f5613c3
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev am: cdec393aa3
...
am: fce339c49c
Change-Id: I1b2478820fbc282aa0448d1e1966f0cf81a2b207
2017-06-09 21:06:48 +00:00
Hemant Gupta
afc9832a1d
OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
...
am: e2ac2e20d6
Change-Id: I4641c8bc03d0886d614165ac3c0fd42721c5a046
2017-06-09 21:06:09 +00:00
Felipe Leme
b32c05a36a
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
...
am: 8db148093c
Change-Id: I8f0bfb221b17804d3f9ec7b682ebd1256f53aa76
2017-06-09 21:05:39 +00:00
Felipe Leme
d66af648c2
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
...
am: e4835a2af4
Change-Id: If88ec9c1de2d81d5b629ed0ead8c9911e6f2c0c5
2017-06-09 21:03:27 +00:00
Android Build Merger (Role)
51fb4488f5
Merge "Merge "Add IApnSourceService.aidl" into oc-dr1-dev am: 49444fc090 -s ours" into oc-dr1-dev-plus-aosp
2017-06-09 21:02:51 +00:00
Chen Xu
25c1a060bc
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
...
am: cdec393aa3
Change-Id: I2e175c9a475d2cc2ad225154dbc5c2f855173975
2017-06-09 21:00:26 +00:00
Hemant Gupta
3f6bb65808
OBEX: Add required parameters TAG ID's for PBAP 1.2 am: 6f2b75f574
...
am: b99484cc61
Change-Id: I701377a315a73eb918f8e42129a401072733cb71
2017-06-09 21:00:03 +00:00
Jordan Liu
03d85e51b1
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
...
am: 49444fc090 -s ours
Change-Id: Id3b02a2cbcbcaa1bda5cf3515f9b33642afdb96d
2017-06-09 20:59:54 +00:00
Felipe Leme
0425f9ceea
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
...
am: e4835a2af4
Change-Id: I43a0e7bec7328d7a272c74145817bf4d9a03b69a
2017-06-09 20:59:53 +00:00
Siyamed Sinir
bc626c6358
Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
2017-06-09 20:58:36 +00:00
Hemant Gupta
e2ac2e20d6
OBEX: Add required parameters TAG ID's for PBAP 1.2
...
am: 6f2b75f574
Change-Id: I8dce42c762758a5ab2ca09b92301697af4d29a8a
2017-06-09 20:57:41 +00:00
Chen Xu
fce339c49c
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
...
am: cdec393aa3
Change-Id: I657161b898c66efdf13c48c322e25cefc7733750
2017-06-09 20:57:02 +00:00
TreeHugger Robot
49444fc090
Merge "Add IApnSourceService.aidl" into oc-dr1-dev
2017-06-09 20:54:25 +00:00
Svetoslav Ganov
0541862ec5
Merge "Protect autofill UI against redressing" into oc-dev
2017-06-09 20:53:40 +00:00
Lei Yu
883db32859
Merge changes from topic 'battery_smear_move' into oc-dev
...
* changes:
Batterystats logs smeared power model values
Copy smearing method to BatteryStatsHelper
2017-06-09 20:50:47 +00:00
Hemant Gupta
b99484cc61
OBEX: Add required parameters TAG ID's for PBAP 1.2
...
am: 6f2b75f574
Change-Id: I9110d7fd8b687f3ee59e3d9ea5ef3319873cdf69
2017-06-09 20:50:16 +00:00
Jeff Sharkey
00c66f676f
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
...
am: c017d299ce
Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c
2017-06-09 20:29:11 +00:00
Jeff Sharkey
c017d299ce
Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev
2017-06-09 20:23:23 +00:00
Felipe Leme
8db148093c
Merge "Closes Autofill UIs when back button is pressed." into oc-dev
2017-06-09 19:48:00 +00:00
Felipe Leme
e4835a2af4
Merge "Ignore dispatchProvideStructureForAutofill() when layout is being updated." into oc-dev
2017-06-09 19:42:24 +00:00
Chen Xu
cdec393aa3
Merge "add an extra for rebroadcast of SIM_STATE_CHANGED" into oc-dev
2017-06-09 19:39:56 +00:00
Todd Lee
5fc6653ea7
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
2017-06-09 19:17:28 +00:00