OSDN Git Service
George Burgess IV [Thu, 20 Oct 2016 19:19:15 +0000 (19:19 +0000)]
Merge "Fix a static-analyzer warning."
am:
63b4f6f5db
Change-Id: I85fd6d25733d59da76eb0bab381fdbd3b5a0430d
Treehugger Robot [Thu, 20 Oct 2016 19:06:58 +0000 (19:06 +0000)]
Merge "Fix a static-analyzer warning."
Andreas Huber [Wed, 19 Oct 2016 19:39:03 +0000 (19:39 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
am:
2202b164d8
Change-Id: I43bec2c6d3e6e4201f7a50981f428ef00f384684
Christopher Wiley [Wed, 19 Oct 2016 19:31:57 +0000 (19:31 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration"
am:
239df3cc5a
Change-Id: Id6f064d7a74e41d757de2499653671fc830d217b
Andreas Huber [Wed, 19 Oct 2016 19:30:28 +0000 (19:30 +0000)]
Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on"
Treehugger Robot [Wed, 19 Oct 2016 19:15:30 +0000 (19:15 +0000)]
Merge "Use this.isUp() inside InterfaceConfiguration"
Jason Monk [Wed, 19 Oct 2016 15:15:43 +0000 (15:15 +0000)]
Merge "Hide QS customizer correctly"
am:
03e4eb32fe
Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
Jason Monk [Wed, 19 Oct 2016 15:05:41 +0000 (15:05 +0000)]
Merge "Hide QS customizer correctly"
Brad Ebinger [Tue, 18 Oct 2016 21:30:57 +0000 (21:30 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
am:
42598f4a96
Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004
Brad Ebinger [Tue, 18 Oct 2016 21:22:18 +0000 (21:22 +0000)]
Merge "Add support for new SessionManager and EventManager tests"
Andreas Huber [Tue, 18 Oct 2016 16:24:04 +0000 (09:24 -0700)]
HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on
HwParcel now reflect this change.
Bug:
32237331
Test: hidl_test_java
Change-Id: Ia1ce5a4e3acedd8ebcff15107aea53ce28fde589
Yoshinori Hirano [Mon, 5 Sep 2016 07:11:59 +0000 (16:11 +0900)]
Hide QS customizer correctly
When users open and close QS customizer quickly, QSCustomizer#hide()
is not called because QSCustomizer#isCustomizing() returns false.
The isCustomizing() becomes true when the expand animation ends.
The hide() should be called even though the animation is ongoing.
Bug:
30545089
Test: manual - open and close QS customizer quickly
Change-Id: Ic483addfb6ae9da31c997fec7778e5acd718c353
George Burgess IV [Tue, 18 Oct 2016 01:43:24 +0000 (01:43 +0000)]
Merge "Fix static analyzer warnings."
am:
ff5c3ad08b
Change-Id: I655fd765cfeae407c070261cfe07ce8b739b06fa
Treehugger Robot [Tue, 18 Oct 2016 01:30:54 +0000 (01:30 +0000)]
Merge "Fix static analyzer warnings."
Sanket Agarwal [Mon, 17 Oct 2016 21:28:05 +0000 (21:28 +0000)]
Merge "Remove APIs that are not directly usable."
am:
9cff57312d
Change-Id: I1234db97ed82017ed3bca02e10818a53fdc33d3d
Mark Salyzyn [Mon, 17 Oct 2016 21:25:59 +0000 (21:25 +0000)]
Merge "missing includes"
am:
78929f3ee0
Change-Id: I3e7a25ded484d516fab453abe434c2e53cf0f27e
Treehugger Robot [Mon, 17 Oct 2016 21:16:20 +0000 (21:16 +0000)]
Merge "Remove APIs that are not directly usable."
Treehugger Robot [Mon, 17 Oct 2016 21:12:08 +0000 (21:12 +0000)]
Merge "missing includes"
Sanket Agarwal [Wed, 3 Aug 2016 19:57:34 +0000 (12:57 -0700)]
Remove APIs that are not directly usable.
The right way to expose this API is done via MediaBrowser.
Bug: b/
28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit
b5fbb75aa26a6322b26b1289cc5d14a8c31acb34)
Mark Salyzyn [Mon, 17 Oct 2016 17:10:55 +0000 (10:10 -0700)]
missing includes
Assumptions are made about header side effects
Test: compile
Bug:
30465923
Change-Id: Icc9415aed5e54b2bc00b70aa0da6df4148f30654
Christopher Wiley [Mon, 17 Oct 2016 17:30:28 +0000 (10:30 -0700)]
Use this.isUp() inside InterfaceConfiguration
Bug:
31337216
Test: Compiles
Change-Id: I968a739f9ada47b1357932d2da76451eb26c3d5f
Yoshinori Hirano [Mon, 17 Oct 2016 17:00:44 +0000 (17:00 +0000)]
Merge "Avoid automatically mirroring Drawable of CustomTile"
am:
9a904d68c7
Change-Id: I337620f4a2514a00a6b49275cadde6087e11dddf
Treehugger Robot [Mon, 17 Oct 2016 16:42:17 +0000 (16:42 +0000)]
Merge "Avoid automatically mirroring Drawable of CustomTile"
Christopher Wiley [Mon, 17 Oct 2016 16:41:52 +0000 (16:41 +0000)]
Merge "Add InterfaceConfiguration.isUp()"
am:
c7ea99a63c
Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce
Treehugger Robot [Mon, 17 Oct 2016 16:30:43 +0000 (16:30 +0000)]
Merge "Add InterfaceConfiguration.isUp()"
Neil Fuller [Mon, 17 Oct 2016 16:30:06 +0000 (16:30 +0000)]
Merge "Update time_zones_by_country.xml / delete unused files"
am:
143d13ce59
Change-Id: I1a52ac448247c1ebe7dc19f566e87478131a95e0
Treehugger Robot [Mon, 17 Oct 2016 16:21:58 +0000 (16:21 +0000)]
Merge "Update time_zones_by_country.xml / delete unused files"
yangzhenyu [Mon, 17 Oct 2016 16:08:41 +0000 (16:08 +0000)]
Merge "[ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues"
am:
09dcaf1948
Change-Id: I6227536c270cdac730be60edf35f7ff704e59af0
Treehugger Robot [Mon, 17 Oct 2016 15:59:16 +0000 (15:59 +0000)]
Merge "[ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues"
Neil Fuller [Thu, 13 Oct 2016 08:26:21 +0000 (09:26 +0100)]
Update time_zones_by_country.xml / delete unused files
preferred_time_zones.xml is not referenced in any code and has been
deleted here.
TimeUtilsTest.java is broken / out of date and semi-duplicates code
in android.util.cts.TimeUtilsTest. It has been deleted here.
time_zones_by_country.xml file has not been updated since (at least)
2009.
Ideally this information would be updated as needed when the
timezone rule data is updated on device. This change just brings the
data up to date without addressing that issue. Given the apparent,
non-obvious, ordering requirements it may not be possible to use
zone1970.tab data directly.
---------------
Impact assessment:
At the time of writing time_zones_by_country.xml is used from:
Non-public methods:
android.util.TimeUtils.getTimeZones(String)
Public methods:
android.util.TimeUtils.getTimeZone(int, boolean, long, String)
android.util.TimeUtils.getTimeZonesWithUniqueOffsets(String)
Therefore there is some app / user benefit from updating it.
Within the framework, this affects:
telephony.ServiceStateTracker - in some circumstances when receiving
offset information from cell networks when better information is not
available.
There is some clockwork code affected that uses the calls for similar
purposes.
---------------
Notes on file formats / mapping the IANA source data:
The updated data was sourced from the IANA tzdata 2016g file
called zone1970.tab. The time_zones_by_country.xml file was manually
edited in a text editor using criteria detailed below.
The zone1970.tab file maps country codes (column 1) to a zone ID
(column 3). A country can be mapped to multiple zones. The zone.tab file
that was likely used in the past is similar in content and format. See
the zone.tab file header for details of the differences.
The time_zones_by_country.xml can have multiple entries for each
country, starting with a comment.
Comments exist for each (Country, Offset) pair. The name is
free-text, the offset is a non-DST offset for a zone as of 14th Oct
2016 using the 2016g data.
<!-- {Country name}, {offset from UTC} -->
Countries are listed in ASCII ascending order of the country code.
Within each country offsets are mostly ordered east to
west. An exception appears to be Australia. The data may have a
secondary order of "best match" (e.g. maybe by population). This might
be important for getTimeZone(int, boolean, long, String)) since it
returns the first match for a given offset, dst, country.
The timezone offset, transition information itself (offset, dst) is
pulled from the timezone rules data on the device, not this file.
The data is encoded for each (Country, Offset) pair by a sequence
of:
<timezone code="xx">{Olson ID}</timezone>
xx is the country code from column 1 in the zone1970.tab file, the
element content is the zone ID from column 3.
---------------
Notes on the changes made to time_zones_by_country.xml:
There are various changes in this commit associated with switching from
zone.tab to zone1970.tab as a data source: zone.tab uses different
Olson IDs due to the different criteria used by these files.
The offset in each case will be the same so will have no practical
effect on offsets / zone detection, though will affect the exemplar
location for the zone found.
The remaining changes reflect actual zone / offset changes that
have occurred.
When adding new zones or rearranging existing ones they have been
positioned so as not to modify the first zone for each country or
the first zone per offset because of the uncertainty about the
secondary ordering. This is to avoid the risk of now picking a
different zone for a country or {country + dst + offset}. This
has resulted in a couple of places where the ordering is
non-intuitive.
The zone names and the offset information contained in the comments was
checked semi-manually using other 2016g data, i.e. the base offset of
each zone was checked against output from a script that created a
TimeZone object from each Olson ID in the file and output the raw
(non-DST) offset.
---------------
Change specifics:
Changes made due to zone1970.tab vs zone.tab:
ANTIGUA AND BARBUDA
ANGUILLA
ANGOLA
ALAND ISLANDS
ARUBA
BOSNIA AND HERZEGOVINA
BURKINA FASO
BAHRAIN
BENIN
BOTSWANA
CONGO
CENTRAL AFRICAN REPUBLIC
CONGO
CAMEROON
DJIBOUTI
DOMINICA
ERITREA
ETHIOPIA
GABON
GRENADA
GUERNSEY
GAMBIA
GUINEA
GUADELOUPE
EQUATORIAL GUINEA
CROATIA
ISLE OF MAN
JERSEY
CAMBODIA
COMOROS
SAINT KITTS AND NEVIS
KUWAIT
CAYMAN ISLANDS
LAO PEOPLE'S DEMOCRATIC REPUBLIC
SAINT LUCIA
LIECHTENSTEIN
LESOTHO
MONTENEGRO
MADAGASCAR
MACEDONIA
MALI
NORTHERN MARIANA ISLANDS
MAURITANIA
MONTSERRAT
MALAWI
NIGER
OMAN
RWANDA
SAINT HELENA
SLOVENIA
SVALBARD AND JAN MAYEN
SLOVAKIA
SIERRA LEONE
SAN MARINO
SENEGAL
SOMALIA
SAO TOME AND PRINCIPE
SWAZILAND
TOGO
TANZANIA
UGANDA
UNITED STATES MINOR OUTLYING ISLANDS
HOLY SEE
SAINT VINCENT AND THE GRENADINES
VIRGIN ISLANDS
YEMEN
MAYOTTE
ZAMBIA
ZIMBABWE
---------
Changes due to new data:
ANTARCTICA
ARGENTINA
AUSTRALIA
BRAZIL
CANADA
CHINA
MICRONESIA
INDIA
MYANMAR
MEXICO
PAPUA NEW GUINEA
PALESTINE
RUSSIAN FEDERATION
UNITED STATES
UKRAINE
---------
Removal of NETHERLANDS ANTILLES (country code "an"):
"an" no longer present in the IANA data.
The country code is no longer in use.
https://en.wikipedia.org/wiki/ISO_3166-2:AN
New country entries for:
Saint Barthélemy
Caribbean Netherlands
Curaçao
Collectivity of Saint Martin
Sint Maarten
---------
Changes due to new data *and* with differences between zone1970.tab
and zone.tab:
GERMANY
South Sudan (entirely new)
VIET NAM
FRENCH SOUTHERN TERRITORIES
---------
Changes to comments or arrangement of existing entries due to non-DST
offset changes since the last update:
Antarctica/Mawson
Europe/Minsk
America/Resolute
Atlantic/Stanley
Asia/Pyongyang
America/Cancun
America/Grand_Turk
Pacific/Fakaofo
Europe/Istanbul
America/Caracas
Pacific/Apia
Bug:
25338903
Test: Build / CtsUtilTestCases
Change-Id: I87e3db795f55ddd92e7402459c5e97aa70b9301e
Yoshinori Hirano [Wed, 17 Aug 2016 05:09:58 +0000 (14:09 +0900)]
Avoid automatically mirroring Drawable of CustomTile
Developers of custom tiles should decide whether
the Drawable of their own tiles should be automatically mirrored.
So State#autoMirrorDrawable should be false by default.
Bug:
30930145
Test: manual - change to RTL language and open Quick Settings
Change-Id: Ia3fd8c2aeddb4a27b9ecfaaf52edbcce01fd7f48
yangzhenyu [Wed, 31 Aug 2016 10:26:46 +0000 (18:26 +0800)]
[ActivityManager] Fix the inconsistence between ProcessRecord and BroadcastQueues
Symptom:
Even though one process is executing one BroadcastReceiver,
it may be killed as one EMPTY process occasionally
Detail and sample:
https://code.google.com/p/android/issues/detail?id=221524
Root cause:
app.curReceiver can only remember the last running.
If an application is both receiving FG and BG broadcast,
when one is finished, app.curReceiver becomes null,
the state of application becomes EMPTY.
Solution:
save all running receivers at ProcessRecord
Change-Id: I01b8813af652a8c434be7de0678dc06f99831ae0
Signed-off-by: yangzhenyu <yangzhenyu@xiaomi.com>
Jason Monk [Fri, 14 Oct 2016 19:07:48 +0000 (19:07 +0000)]
Fix launching alarm pending intent am:
d0408f0028 am:
9042736ff1 am:
6aa197116e
am:
2abab0248f
Change-Id: Ife7911f26ebcf96802e2a9ac3f2f179d0d486d2c
Jason Monk [Fri, 14 Oct 2016 19:00:46 +0000 (19:00 +0000)]
Fix launching alarm pending intent am:
d0408f0028 am:
9042736ff1
am:
6aa197116e
Change-Id: Ide52a40383e181a07ec24ce4d89d5368a69c635d
Jason Monk [Fri, 14 Oct 2016 18:54:00 +0000 (18:54 +0000)]
Fix launching alarm pending intent am:
d0408f0028
am:
9042736ff1
Change-Id: Id2c2ccf79c62c5e0e498259a2b88e44cb98a70b3
Jason Monk [Fri, 14 Oct 2016 18:46:44 +0000 (18:46 +0000)]
Fix launching alarm pending intent
am:
d0408f0028
Change-Id: I01f3963617638bf8c1cb8efccf027dd8a9084517
Jason Monk [Fri, 14 Oct 2016 14:46:37 +0000 (10:46 -0400)]
Fix launching alarm pending intent
Launch it as a pending intent.
Change-Id: I2adf9347facb9c6fb58cbf8549233c34fcc87350
Fixes:
23909438
Jakub Adámek [Fri, 14 Oct 2016 15:12:10 +0000 (15:12 +0000)]
Merge "Adding customizable background color support for watch." into cw-f-dev
am:
881011d951
Change-Id: I6c6a98b7f207406a21e41ef4768e45bb190270aa
Jakub Adamek [Fri, 14 Oct 2016 15:12:03 +0000 (15:12 +0000)]
Adding customizable background color support for watch.
am:
e39fbd8785
Change-Id: I0585a0fb8dcf6ac8d408d7d848299629486ffa02
Jakub Adámek [Fri, 14 Oct 2016 15:06:43 +0000 (15:06 +0000)]
Merge "Adding customizable background color support for watch." into cw-f-dev
George Burgess IV [Fri, 14 Oct 2016 14:39:06 +0000 (14:39 +0000)]
Merge "Fix static-analyzer warning." am:
2fbf30d3fe am:
a52992e290
am:
c88628da5e
Change-Id: Iece80dfbd8a5d01ffdcf6edf1decd8078af31511
Jakub Pawlowski [Fri, 14 Oct 2016 14:38:10 +0000 (14:38 +0000)]
Merge "Fix Bluetooth OOB pairing not working for unseen devices" am:
3ef0315eb7 am:
bd1a923cac
am:
08109a61d2
Change-Id: Id97645d7026466771a011ba787dce9866dc029d2
Sungsoo [Fri, 14 Oct 2016 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1 am:
2179b54c9c -s ours am:
279ebd7ffd am:
7598d6ac9f am:
30404396be am:
d7475b491d -s ours am:
3069b72d76
am:
20b502a6b1
Change-Id: I0aab1a7164cc1ae0e5bb326b5e3a16f4f82811ac
Sungsoo [Fri, 14 Oct 2016 14:36:06 +0000 (14:36 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559 am:
2816a5fa5e -s ours am:
03593fe78f am:
ad11872ded am:
d3f3729a17 am:
9d675aadf1 -s ours am:
3ab3eff7c1
am:
b25d26c40c
Change-Id: I2d61ebdd72d9734bd028050f5378daa702509173
Sungsoo [Fri, 14 Oct 2016 14:35:13 +0000 (14:35 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3 am:
11b522b40f -s ours am:
8b764f10c3 am:
29273190f1 am:
7bb855a973 am:
68469a695e -s ours am:
b4fdad2b8c
am:
93b3e8e606
Change-Id: Ia5364aa347ecbc8365078fca55151d00d2b874c8
Sungsoo [Fri, 14 Oct 2016 14:34:17 +0000 (14:34 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
7ce9243087 am:
bb800841ca am:
016c5889bc am:
d6508621fc -s ours am:
b576f816c5
am:
315b8b7bbc
Change-Id: I77c388c612abb7e315a7aacc6de51b2648716421
Sungsoo Lim [Fri, 14 Oct 2016 14:33:20 +0000 (14:33 +0000)]
Merge "ExifInterface: Provide backward compatibility" into nyc-dev am:
e29077105e
am:
013d3a4964
Change-Id: I5b57c744a880b595c3502491d41957832f3ee520
Sungsoo [Fri, 14 Oct 2016 14:32:31 +0000 (14:32 +0000)]
ExifInterface: Provide backward compatibility am:
2dbe166801
am:
6e01f028ab
Change-Id: Ibda28727ab8de7c7576e46dba411d9ba334ab1a4
Svetoslav Ganov [Fri, 14 Oct 2016 14:31:42 +0000 (14:31 +0000)]
Merge "Allow SetupWizard to do WiFi scans if location off" am:
c98b34bdce am:
72510e6244
am:
cf146edb32
Change-Id: Icb456bac6bf5bf357848d73356adbd8772c37817
Bert McMeen [Fri, 14 Oct 2016 14:30:44 +0000 (14:30 +0000)]
Docs: Updates to the Download/Test file related to watch setup am:
137c545e4e
am:
4c5141b98b
Change-Id: I5a819483cb7acab434c81442dee13ee3c80f9e28
Yuta Yamada [Fri, 14 Oct 2016 14:29:58 +0000 (14:29 +0000)]
Merge "Fix memory leak of Dnd tile" am:
6057a8360a am:
465397e28e
am:
be3b53beca
Change-Id: I12dae89a0b577379e7a868182b535f5dcda09d36
Selim Cinek [Fri, 14 Oct 2016 14:29:03 +0000 (14:29 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" am:
6f3a05ae77 -s ours am:
20307881d7 -s ours
am:
e58f1e5965
Change-Id: I483d2f52d347d2fb0064a6f9a0e6db3d5a61aa67
Selim Cinek [Fri, 14 Oct 2016 14:28:12 +0000 (14:28 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" am:
d33e79c328 -s ours am:
cb654a5fbd -s ours
am:
8bd7df4536
Change-Id: I89a5d36d40cd1b1973f99406905bafc20ba1c8dc
Robert Greenwalt [Fri, 14 Oct 2016 14:27:22 +0000 (14:27 +0000)]
Merge "Add free short codes for direct carrier billing and others" am:
73c50f7dbc am:
6f8c54a16d
am:
2b06e19f2d
Change-Id: I50e107a8dc433cdc563ad6663ec5feef8e992fc2
Shinji Sogo [Fri, 14 Oct 2016 14:26:32 +0000 (14:26 +0000)]
Merge "Don't compare FQDN with providerFriendlyName" am:
aae64557e1 am:
9c84160545
am:
b8bab1df10
Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3
Adam Lesinski [Fri, 14 Oct 2016 14:25:39 +0000 (14:25 +0000)]
Merge "RRO: Synchronize access to overlays.list" am:
78382db820 am:
1b9303e8f0
am:
c68597e671
Change-Id: I067a006032a73d646f779669db9dcf6a25020709
Jorim Jaggi [Fri, 14 Oct 2016 14:24:48 +0000 (14:24 +0000)]
Merge "Fix split-screen flash issue" am:
6738617652 am:
f1fed4de21
am:
4e7407a80e
Change-Id: Ibfef3bd01a54cca64a2f0de197bd9480a7539cd0
Rebecca Silberstein [Fri, 14 Oct 2016 14:23:56 +0000 (14:23 +0000)]
Merge "Tethering: check if configManager is null" am:
e011bf80c5 am:
d1e4dbf002
am:
d33a0ee710
Change-Id: I2d8cfac1093b6973b2b5f06e2ba37cff9866d82a
Brad Ebinger [Fri, 14 Oct 2016 14:22:38 +0000 (14:22 +0000)]
Merge "Transplant the Logging system from Telecom" am:
cbb03d1ad3 am:
951dca8209
am:
0ab9a078e9
Change-Id: I79e6b2de4bf523036ed1d15debd142a1786249c5
Christopher Wiley [Fri, 14 Oct 2016 14:21:39 +0000 (14:21 +0000)]
Merge "IndexOutOfBoundsException observed in ProcessStats" am:
6408e2e5cc am:
eedd2b529d
am:
53d12379f4
Change-Id: I4bcde8dde8c3bad7754e26dd56f8321032daa5a3
John Reck [Fri, 14 Oct 2016 14:20:42 +0000 (14:20 +0000)]
Merge "Fix SurfaceViewPositionListener race bugs" am:
2dc11c0500 am:
ee3adf6d91
am:
f136fa872f
Change-Id: Ifd944500fb75bdefa30e0f083e26b0de2cc1cb3a
Andre Eisenbach [Fri, 14 Oct 2016 14:19:49 +0000 (14:19 +0000)]
Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am:
5c043f51b0 am:
3c3329bd34
am:
d6a85bdea3
Change-Id: Id01a44e2424cb71b7ab89592d84de272b25ae0fe
Andreas Gampe [Fri, 14 Oct 2016 14:18:58 +0000 (14:18 +0000)]
Merge "Debug: Use UniqueFile" am:
546f755bf8 am:
8d151b26c2
am:
77a2f22f77
Change-Id: Ib904c45f715b742f3cd78c54c9bddbda1dc0946b
Selim Cinek [Fri, 14 Oct 2016 14:17:58 +0000 (14:17 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" am:
a0322d5c5a -s ours am:
00c553e1ba -s ours
am:
8f681f7220
Change-Id: Ic3fe3a5021097097a3b818040e046de1e9011941
lei.peng [Fri, 14 Oct 2016 14:17:07 +0000 (14:17 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am:
80587da3c1 am:
93c75d07c1
am:
d975003af3
Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206
Stephen Li [Fri, 14 Oct 2016 14:16:15 +0000 (14:16 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master am:
6accb573ab
am:
7cbe133507
Change-Id: I7f1aa17fecc22655a80ddc993786fa77039fa71b
Jordan Liu [Fri, 14 Oct 2016 14:15:26 +0000 (14:15 +0000)]
Add cdma_3waycall_flash_delay key to CarrierConfig am:
e5535d71fc
am:
90c20a884d
Change-Id: Iea5e694e0cafc74f2c17286737ce22403f39f0e7
Stephen Li [Fri, 14 Oct 2016 14:14:26 +0000 (14:14 +0000)]
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master am:
302b99512f
am:
5428d11e23
Change-Id: I047d87af55905122c8d032c06919a0d58e929cd8
Robert Sesek [Fri, 14 Oct 2016 14:13:27 +0000 (14:13 +0000)]
Merge "resolve merge conflicts of
8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am:
adb4389cc1
Change-Id: Ic031be1b1efa6fc5555ad02a4e00f810213deda9
Robert Sesek [Fri, 14 Oct 2016 14:07:57 +0000 (14:07 +0000)]
Merge "resolve merge conflicts of
0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 14 Oct 2016 09:27:40 +0000 (09:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
dc7280fe74 -s ours
am:
44de8bed78 -s ours
Change-Id: Icf52bab9a22de5f71dbf4ab376e77e1a8c2a5027
Bill Yi [Fri, 14 Oct 2016 09:26:39 +0000 (09:26 +0000)]
Import translations. DO NOT MERGE am:
ade9e011a8 -s ours
am:
40e8df7169 -s ours
Change-Id: I319801dd4f7ca83db79cbd76e3b717cf718252bc
Bill Yi [Fri, 14 Oct 2016 09:22:27 +0000 (09:22 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours" into cw-f-dev
am:
c4c7942ee2 -s ours
Change-Id: I4600e0f79e4d068607e8c210b2a10559ae557cbb
Bill Yi [Fri, 14 Oct 2016 09:22:22 +0000 (09:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours
am:
fca9f14523 -s ours
Change-Id: I93d33092855c51ea31bd376ea49e3a312bb88eac
Bill Yi [Fri, 14 Oct 2016 09:20:58 +0000 (09:20 +0000)]
Merge "Import translations. DO NOT MERGE am:
cda884446e -s ours" into cw-f-dev
am:
a96ca901cc -s ours
Change-Id: I7985ed5d491f052aa70ab58bd71fe5474d5f834f
Bill Yi [Fri, 14 Oct 2016 09:20:54 +0000 (09:20 +0000)]
Import translations. DO NOT MERGE am:
cda884446e -s ours
am:
a4999db816 -s ours
Change-Id: I311398a105adc70088fb628bd84fd3c360b973da
Bill Yi [Fri, 14 Oct 2016 09:19:33 +0000 (09:19 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours" into cw-f-dev
am:
18593450fc -s ours
Change-Id: I8f8fa42d04a17027bbb27073ff14a56e78143b41
Bill Yi [Fri, 14 Oct 2016 09:19:27 +0000 (09:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours
am:
8f1a1aace1 -s ours
Change-Id: I30fc17073009bfc08819ad6db1f8215e28e092a5
Bill Yi [Fri, 14 Oct 2016 09:18:04 +0000 (09:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
dc7280fe74 -s ours
Change-Id: Id76b78032b01aed87ff6b203d44c09324aefea62
Bill Yi [Fri, 14 Oct 2016 09:18:02 +0000 (09:18 +0000)]
Import translations. DO NOT MERGE
am:
ade9e011a8 -s ours
Change-Id: Iee7cdf3066efea6cb75c40b908117ddeb19d1b52
Bill Yi [Fri, 14 Oct 2016 09:17:56 +0000 (09:17 +0000)]
Merge "Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours" into cw-f-dev
am:
3337a3ef87 -s ours
Change-Id: Iba964ce6d5342d54f544311fa109dc650be28637
Bill Yi [Fri, 14 Oct 2016 09:17:52 +0000 (09:17 +0000)]
Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours
am:
5dca6db3ba -s ours
Change-Id: I8c55c0ead2b5ae0865d7fbd189220a2f20e27a43
Bill Yi [Fri, 14 Oct 2016 09:16:39 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
73d6846d28 -s ours
Change-Id: I5e5827ccf9759a118d6cc2bc31c0d7414292a78c
Bill Yi [Fri, 14 Oct 2016 09:16:35 +0000 (09:16 +0000)]
Import translations. DO NOT MERGE
am:
f32982dad6 -s ours
Change-Id: I7195f0f0f464516a29dbb853a8e3623fc845b7f9
Bill Yi [Fri, 14 Oct 2016 09:15:11 +0000 (09:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
56f7606fa1 -s ours
Change-Id: I0e526ccef4fa53e447e3fc27bef49595672e6857
Bill Yi [Fri, 14 Oct 2016 09:15:07 +0000 (09:15 +0000)]
Import translations. DO NOT MERGE
am:
9396a20e3f -s ours
Change-Id: I82d06bff01dd03a8d0842b5db8f7f35867e3c315
TreeHugger Robot [Fri, 14 Oct 2016 09:12:50 +0000 (09:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 14 Oct 2016 09:11:06 +0000 (09:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e3c1d48dc0 -s ours" into cw-f-dev
Android Build Merger (Role) [Fri, 14 Oct 2016 09:10:47 +0000 (09:10 +0000)]
Merge "Import translations. DO NOT MERGE am:
cda884446e -s ours" into cw-f-dev
Bill Yi [Fri, 14 Oct 2016 09:10:07 +0000 (09:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e3c1d48dc0 -s ours
Change-Id: Ia3d8d98b07f606740644edf3b02f69be93d18a68
Bill Yi [Fri, 14 Oct 2016 09:10:05 +0000 (09:10 +0000)]
Import translations. DO NOT MERGE
am:
cda884446e -s ours
Change-Id: I2365ca83a9522ca86d85f4dbc1c51c2350d8a6f6
Android Build Merger (Role) [Fri, 14 Oct 2016 09:09:46 +0000 (09:09 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
a2dabae9dd -s ours" into cw-f-dev
Android Build Merger (Role) [Fri, 14 Oct 2016 09:09:26 +0000 (09:09 +0000)]
Merge "Import translations. DO NOT MERGE am:
3e8a8c97bb -s ours" into cw-f-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:08:52 +0000 (09:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 14 Oct 2016 09:08:46 +0000 (09:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
a2dabae9dd -s ours
Change-Id: I18f9aec026325e0ee42f9a8b228a6f235a9050b3
Bill Yi [Fri, 14 Oct 2016 09:08:44 +0000 (09:08 +0000)]
Import translations. DO NOT MERGE
am:
3e8a8c97bb -s ours
Change-Id: I55e6b60d44c99e47783526de2176bbd7c9929b47
TreeHugger Robot [Fri, 14 Oct 2016 09:08:31 +0000 (09:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:04:59 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 14 Oct 2016 09:04:08 +0000 (09:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Jakub Adamek [Fri, 14 Oct 2016 08:13:39 +0000 (09:13 +0100)]
Adding customizable background color support for watch.
values-watch/themes.xml changes some Material themes, e.g.
Dialog inherits from Dark rather than Light. Hence I have moved
all of the theme modifications into
values-watch/themes_device_defaults.xml as they wouldn't be the same
for phones.
Tested: Manually on watch and on angler. Ran CTS host side theme
tests on cw-f-dev, all passed.
cts-tf > run cts -m CtsThemeHostTestCases
Bug:
31459804
Change-Id: I74a8502469cc76ac27a471c0bf18b22fd57f5418