drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,425 Commits 1 Branch 0 Tags
Commit Graph

276425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2e98bb8d48 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dc7280fe74 -s ours 
am: 44de8bed78  -s ours

Change-Id: Icf52bab9a22de5f71dbf4ab376e77e1a8c2a5027
 2016-10-14 09:27:40 +00:00
Bill Yi
c12a077bc9 Import translations. DO NOT MERGE am: ade9e011a8 -s ours 
am: 40e8df7169  -s ours

Change-Id: I319801dd4f7ca83db79cbd76e3b717cf718252bc
 2016-10-14 09:26:39 +00:00
Bill Yi
b01f5a835c 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
 2016-10-14 09:22:27 +00:00
Bill Yi
f258beafa5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0 -s ours 
am: fca9f14523  -s ours

Change-Id: I93d33092855c51ea31bd376ea49e3a312bb88eac
 2016-10-14 09:22:22 +00:00
Bill Yi
924c893884 Merge "Import translations. DO NOT MERGE am: cda884446e -s ours" into cw-f-dev 
am: a96ca901cc  -s ours

Change-Id: I7985ed5d491f052aa70ab58bd71fe5474d5f834f
 2016-10-14 09:20:58 +00:00
Bill Yi
858d8e8452 Import translations. DO NOT MERGE am: cda884446e -s ours 
am: a4999db816  -s ours

Change-Id: I311398a105adc70088fb628bd84fd3c360b973da
 2016-10-14 09:20:54 +00:00
Bill Yi
664a7ccaea 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
 2016-10-14 09:19:33 +00:00
Bill Yi
2416e556e9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a2dabae9dd -s ours 
am: 8f1a1aace1  -s ours

Change-Id: I30fc17073009bfc08819ad6db1f8215e28e092a5
 2016-10-14 09:19:27 +00:00
Bill Yi
44de8bed78 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: dc7280fe74  -s ours

Change-Id: Id76b78032b01aed87ff6b203d44c09324aefea62
 2016-10-14 09:18:04 +00:00
Bill Yi
40e8df7169 Import translations. DO NOT MERGE 
am: ade9e011a8  -s ours

Change-Id: Iee7cdf3066efea6cb75c40b908117ddeb19d1b52
 2016-10-14 09:18:02 +00:00
Bill Yi
88efec3c6a Merge "Import translations. DO NOT MERGE am: 3e8a8c97bb -s ours" into cw-f-dev 
am: 3337a3ef87  -s ours

Change-Id: Iba964ce6d5342d54f544311fa109dc650be28637
 2016-10-14 09:17:56 +00:00
Bill Yi
38f17c86e6 Import translations. DO NOT MERGE am: 3e8a8c97bb -s ours 
am: 5dca6db3ba  -s ours

Change-Id: I8c55c0ead2b5ae0865d7fbd189220a2f20e27a43
 2016-10-14 09:17:52 +00:00
Bill Yi
64ae1be8a8 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 73d6846d28  -s ours

Change-Id: I5e5827ccf9759a118d6cc2bc31c0d7414292a78c
 2016-10-14 09:16:39 +00:00
Bill Yi
1eea89e79b Import translations. DO NOT MERGE 
am: f32982dad6  -s ours

Change-Id: I7195f0f0f464516a29dbb853a8e3623fc845b7f9
 2016-10-14 09:16:35 +00:00
Bill Yi
cd4b06c390 Merge "Import translations. DO NOT MERGE" into cw-f-dev 
am: 56f7606fa1  -s ours

Change-Id: I0e526ccef4fa53e447e3fc27bef49595672e6857
 2016-10-14 09:15:11 +00:00
Bill Yi
6fc371149e Import translations. DO NOT MERGE 
am: 9396a20e3f  -s ours

Change-Id: I82d06bff01dd03a8d0842b5db8f7f35867e3c315
 2016-10-14 09:15:07 +00:00
TreeHugger Robot
dc7280fe74 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-14 09:12:52 +00:00
Android Build Merger (Role)
c4c7942ee2 Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0 -s ours" into cw-f-dev 2016-10-14 09:11:08 +00:00
Android Build Merger (Role)
a96ca901cc Merge "Import translations. DO NOT MERGE am: cda884446e -s ours" into cw-f-dev 2016-10-14 09:10:50 +00:00
Bill Yi
fca9f14523 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: e3c1d48dc0  -s ours

Change-Id: Ia3d8d98b07f606740644edf3b02f69be93d18a68
 2016-10-14 09:10:07 +00:00
Bill Yi
a4999db816 Import translations. DO NOT MERGE 
am: cda884446e  -s ours

Change-Id: I2365ca83a9522ca86d85f4dbc1c51c2350d8a6f6
 2016-10-14 09:10:05 +00:00
Android Build Merger (Role)
18593450fc Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a2dabae9dd -s ours" into cw-f-dev 2016-10-14 09:09:50 +00:00
Android Build Merger (Role)
3337a3ef87 Merge "Import translations. DO NOT MERGE am: 3e8a8c97bb -s ours" into cw-f-dev 2016-10-14 09:09:29 +00:00
TreeHugger Robot
73d6846d28 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-14 09:08:54 +00:00
Bill Yi
8f1a1aace1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: a2dabae9dd  -s ours

Change-Id: I18f9aec026325e0ee42f9a8b228a6f235a9050b3
 2016-10-14 09:08:46 +00:00
Bill Yi
5dca6db3ba Import translations. DO NOT MERGE 
am: 3e8a8c97bb  -s ours

Change-Id: I55e6b60d44c99e47783526de2176bbd7c9929b47
 2016-10-14 09:08:44 +00:00
TreeHugger Robot
56f7606fa1 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-14 09:08:33 +00:00
TreeHugger Robot
e3c1d48dc0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-14 09:05:01 +00:00
TreeHugger Robot
a2dabae9dd Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-14 09:04:10 +00:00
Jakub Adamek
e39fbd8785 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
 2016-10-14 09:18:23 +01:00
Bill Yi
cda884446e Import translations. DO NOT MERGE 
Change-Id: I76af7719d843ed75ebd7952186ea2a38e58195b9
Auto-generated-cl: translation import
 2016-10-13 23:17:12 -07:00
Bill Yi
3e8a8c97bb Import translations. DO NOT MERGE 
Change-Id: Id8ce479a4a98e715a350930a515acd543c59a71e
Auto-generated-cl: translation import
 2016-10-13 23:06:12 -07:00
George Burgess IV
c88628da5e Merge "Fix static-analyzer warning." am: 2fbf30d3fe 
am: a52992e290

Change-Id: I62bfb1ff3218a9f790b1858d6d6013a93ffbe008
 2016-10-14 02:37:19 +00:00
George Burgess IV
a52992e290 Merge "Fix static-analyzer warning." 
am: 2fbf30d3fe

Change-Id: I1c297dfe786d92834cd4bd8b7d3177a7d9529074
 2016-10-14 02:32:10 +00:00
Treehugger Robot
2fbf30d3fe Merge "Fix static-analyzer warning." 2016-10-14 02:21:10 +00:00
Jakub Pawlowski
08109a61d2 Merge "Fix Bluetooth OOB pairing not working for unseen devices" am: 3ef0315eb7 
am: bd1a923cac

Change-Id: I378f55d65663a1628ca53c1e2a63b850aac94845
 2016-10-14 01:42:10 +00:00
Jakub Pawlowski
bd1a923cac Merge "Fix Bluetooth OOB pairing not working for unseen devices" 
am: 3ef0315eb7

Change-Id: I05f7aaf1f0bdbffb6ef21e9250631633debb6b8b
 2016-10-14 01:37:05 +00:00
Treehugger Robot
3ef0315eb7 Merge "Fix Bluetooth OOB pairing not working for unseen devices" 2016-10-14 01:25:11 +00:00
Bill Yi
f32982dad6 Import translations. DO NOT MERGE 
Change-Id: I689e8eaf2bc621bc2a15faca830ff052e76c29e1
Auto-generated-cl: translation import
 2016-10-13 17:51:03 -07:00
Bill Yi
9396a20e3f Import translations. DO NOT MERGE 
Change-Id: I3a29facc38c4e3f02dd9c0c597b936e68a135bb0
Auto-generated-cl: translation import
 2016-10-13 17:42:34 -07:00
Garfield Tan
9a5570f5bc Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev am: 8a032b98fe 
am: 97944c00fe

Change-Id: I85c8c7c4bf1d4e3f8a3904b2c417f5ec20cb520f
 2016-10-14 00:13:59 +00:00
Garfield Tan
706530bd88 DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. am: d91dd17f36 
am: cc6a8b5190

Change-Id: Ia361f86f771a5b59ce10d4aefb6a8a53e48b4c92
 2016-10-14 00:12:58 +00:00
Garfield Tan
97944c00fe Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev 
am: 8a032b98fe

Change-Id: I22661618ad5516f264ce8e478583f46a296bd3ef
 2016-10-14 00:05:36 +00:00
Garfield Tan
cc6a8b5190 DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails. 
am: d91dd17f36

Change-Id: Ia7400ff8e4ecfd903a6ff7f5158786d3fd8c1bff
 2016-10-14 00:05:32 +00:00
Ben Lin
27c9ff263b Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev am: c8358bfe65 
am: 642941d629

Change-Id: I48357c812334f6150ce903af470f865f99311fbd
 2016-10-14 00:02:43 +00:00
TreeHugger Robot
8a032b98fe Merge "DO NOT MERGE: Not to crash DocumentsUI if moving cursor fails." into nyc-mr1-dev 2016-10-14 00:02:33 +00:00
Ben Lin
54875dd37a Removing a mimeIcon specific for album folders from MediaProvider. am: 6d33357882 
am: f3b7acecc7

Change-Id: I227fae0ffb4b97c5caec4cb60120486defdb8a81
 2016-10-14 00:01:50 +00:00
Ben Lin
642941d629 Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev 
am: c8358bfe65

Change-Id: Ic4ba062d30bacfc4ee7ab1ff77e44caab30c6eb4
 2016-10-13 23:51:36 +00:00
Ben Lin
f3b7acecc7 Removing a mimeIcon specific for album folders from MediaProvider. 
am: 6d33357882

Change-Id: I07ec7d315c510a5c3bb289a7fa2f6bb8100ebee8
 2016-10-13 23:51:33 +00:00
Ben Lin
c8358bfe65 Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev 2016-10-13 23:45:29 +00:00