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
Hemal Patel
0849ffa5c1 Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am: 5b2493a655 am: 52b9db5a82 
am: 109e738292

Change-Id: Ief4bd204f415c043afc571cde50e997596d729b8
 2016-10-14 22:20:35 +00:00
Julius D'souza
897373916f DO NOT MERGE: remove miscellaneous logging 
Change-Id: Id5ca513228e87b3d3b4e66ad34537ed454c65ad2
 2016-10-14 15:20:15 -07:00
Hemal Patel
6233b45093 Docs: Fixed the menu navigation instructions am: c29dac71c0 am: c2a22f3b41 
am: f055b640eb

Change-Id: I66254d562342d878af0ef1e4435bb4c211e9757f
 2016-10-14 22:18:33 +00:00
Hemal Patel
109e738292 Merge "Docs: Fixed the menu navigation instructions" into nyc-dev am: 5b2493a655 
am: 52b9db5a82

Change-Id: I9e7093c33b8409f88ba5a9319a417c2e89fc7342
 2016-10-14 22:11:42 +00:00
Hemal Patel
f055b640eb Docs: Fixed the menu navigation instructions am: c29dac71c0 
am: c2a22f3b41

Change-Id: Ic96f48238e790f925caf7d666681d865deeacf11
 2016-10-14 22:10:34 +00:00
Hemal Patel
52b9db5a82 Merge "Docs: Fixed the menu navigation instructions" into nyc-dev 
am: 5b2493a655

Change-Id: I7fdb0dabb7f530c71e4331261fbac874eea36da9
 2016-10-14 22:02:15 +00:00
Hemal Patel
c2a22f3b41 Docs: Fixed the menu navigation instructions 
am: c29dac71c0

Change-Id: I0f22649ba3c4dbbca06e5d5087d6fde6737a8467
 2016-10-14 22:02:10 +00:00
Hemal Patel
5b2493a655 Merge "Docs: Fixed the menu navigation instructions" into nyc-dev 2016-10-14 21:52:46 +00:00
Matthew Bouyack
c84731ae3b DO NOT MERGE Improved anti-aliasing for circular display mask 
Calculate the alpha value for each pixel in the display mask based on
the area of overlap between the circle and that pixel.

This works around a bug in Skia that is fixed in master.

Change-Id: Ieb8df0d6f46f07cff1dbc368d74938ec699e08cf
 2016-10-14 14:41:25 -07:00
Michael Kwan
e6c38677a4 Fix oversized icons and removed title line limit. 
The maxHeight and maxWidth restrictions we not in effect
due to a missing adjustViewBounds="true". Fixed the issue
by adding the missing attribute.

The title limit was originally arbitrarily picked, not removed
completely.

Bug: 32173774
Change-Id: I4b31824454fec73cec02cb787fe073bde6b69aff
 2016-10-14 14:01:07 -07:00
Jason Monk
4843210683 Fix launching alarm pending intent am: d0408f0028 am: 9042736ff1 am: 6aa197116e 
am: 2abab0248f

Change-Id: Ife7911f26ebcf96802e2a9ac3f2f179d0d486d2c
 2016-10-14 19:07:48 +00:00
Jason Monk
2abab0248f Fix launching alarm pending intent am: d0408f0028 am: 9042736ff1 
am: 6aa197116e

Change-Id: Ide52a40383e181a07ec24ce4d89d5368a69c635d
 2016-10-14 19:00:46 +00:00
Jason Monk
6aa197116e Fix launching alarm pending intent am: d0408f0028 
am: 9042736ff1

Change-Id: Id2c2ccf79c62c5e0e498259a2b88e44cb98a70b3
 2016-10-14 18:54:00 +00:00
Jason Monk
9042736ff1 Fix launching alarm pending intent 
am: d0408f0028

Change-Id: I01f3963617638bf8c1cb8efccf027dd8a9084517
 2016-10-14 18:46:44 +00:00
Adam Lesinski
4309721843 Update DisplayMetrics even on default display 
Fix a bug where the DisplayMetrics wouldn't be updated for a Resources
object on the default display. Since multi-window, we want to update
all Resources.

This didn't always manifest itself due to recreation of assets, which
would force an update of DisplayMetrics. Re-use of an AssetManager from
the cache would expose the bug.

Bug:32133693
Bug:31998629
Test: cts-tradefed run cts --module CtsServicesHostTestCases
Change-Id: Ic51ab82710517b87eb995ccf982085dba876ad58
 2016-10-14 18:16:18 +00:00
Dirk Dougherty
3376f5893f Add API 25 to @since list. 
Change-Id: I636c8e948530d4aa3900496f042f54beb57da15a
 2016-10-14 10:27:08 -07:00
Jason Monk
d0408f0028 Fix launching alarm pending intent 
Launch it as a pending intent.

Change-Id: I2adf9347facb9c6fb58cbf8549233c34fcc87350
Fixes: 23909438
 2016-10-14 15:34:26 +00:00
Jakub Adámek
c744ba2426 Merge "Adding customizable background color support for watch." into cw-f-dev 
am: 881011d951

Change-Id: I6c6a98b7f207406a21e41ef4768e45bb190270aa
 2016-10-14 15:12:10 +00:00
Jakub Adamek
abb22a1387 Adding customizable background color support for watch. 
am: e39fbd8785

Change-Id: I0585a0fb8dcf6ac8d408d7d848299629486ffa02
 2016-10-14 15:12:03 +00:00
Jakub Adámek
881011d951 Merge "Adding customizable background color support for watch." into cw-f-dev 2016-10-14 15:06:47 +00:00
George Burgess IV
a40eeb0979 Merge "Fix static-analyzer warning." am: 2fbf30d3fe am: a52992e290 
am: c88628da5e

Change-Id: Iece80dfbd8a5d01ffdcf6edf1decd8078af31511
 2016-10-14 14:39:06 +00:00
Jakub Pawlowski
414c77ce1c Merge "Fix Bluetooth OOB pairing not working for unseen devices" am: 3ef0315eb7 am: bd1a923cac 
am: 08109a61d2

Change-Id: Id97645d7026466771a011ba787dce9866dc029d2
 2016-10-14 14:38:10 +00:00
Sungsoo
97d7eba123 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
 2016-10-14 14:37:06 +00:00
Sungsoo
5e2766e93e 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
 2016-10-14 14:36:06 +00:00
Sungsoo
6dac084668 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
 2016-10-14 14:35:13 +00:00
Sungsoo
adb0afcef1 DO NOT MERGE) ExifInterface: Provide backward compatibility am: 7ce9243087 am: bb800841ca am: 016c5889bc am: d6508621fc -s ours am: b576f816c5 
am: 315b8b7bbc

Change-Id: I77c388c612abb7e315a7aacc6de51b2648716421
 2016-10-14 14:34:17 +00:00
Sungsoo Lim
9da35bbaad Merge "ExifInterface: Provide backward compatibility" into nyc-dev am: e29077105e 
am: 013d3a4964

Change-Id: I5b57c744a880b595c3502491d41957832f3ee520
 2016-10-14 14:33:20 +00:00
Sungsoo
e441ce97a8 ExifInterface: Provide backward compatibility am: 2dbe166801 
am: 6e01f028ab

Change-Id: Ibda28727ab8de7c7576e46dba411d9ba334ab1a4
 2016-10-14 14:32:31 +00:00
Svetoslav Ganov
a6b3788891 Merge "Allow SetupWizard to do WiFi scans if location off" am: c98b34bdce am: 72510e6244 
am: cf146edb32

Change-Id: Icb456bac6bf5bf357848d73356adbd8772c37817
 2016-10-14 14:31:42 +00:00
Bert McMeen
74217dfeba Docs: Updates to the Download/Test file related to watch setup am: 137c545e4e 
am: 4c5141b98b

Change-Id: I5a819483cb7acab434c81442dee13ee3c80f9e28
 2016-10-14 14:30:44 +00:00
Yuta Yamada
dd1bd9875f Merge "Fix memory leak of Dnd tile" am: 6057a8360a am: 465397e28e 
am: be3b53beca

Change-Id: I12dae89a0b577379e7a868182b535f5dcda09d36
 2016-10-14 14:29:58 +00:00
Selim Cinek
f69a47fcdc 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
 2016-10-14 14:29:03 +00:00
Selim Cinek
c01d969abf Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328 -s ours am: cb654a5fbd -s ours 
am: 8bd7df4536

Change-Id: I89a5d36d40cd1b1973f99406905bafc20ba1c8dc
 2016-10-14 14:28:12 +00:00
Robert Greenwalt
c8c013f88d Merge "Add free short codes for direct carrier billing and others" am: 73c50f7dbc am: 6f8c54a16d 
am: 2b06e19f2d

Change-Id: I50e107a8dc433cdc563ad6663ec5feef8e992fc2
 2016-10-14 14:27:22 +00:00
Shinji Sogo
dafb19bb59 Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1 am: 9c84160545 
am: b8bab1df10

Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3
 2016-10-14 14:26:32 +00:00
Adam Lesinski
29331aed30 Merge "RRO: Synchronize access to overlays.list" am: 78382db820 am: 1b9303e8f0 
am: c68597e671

Change-Id: I067a006032a73d646f779669db9dcf6a25020709
 2016-10-14 14:25:39 +00:00
Jorim Jaggi
3f23c9f36e Merge "Fix split-screen flash issue" am: 6738617652 am: f1fed4de21 
am: 4e7407a80e

Change-Id: Ibfef3bd01a54cca64a2f0de197bd9480a7539cd0
 2016-10-14 14:24:48 +00:00
Rebecca Silberstein
e0a27e855b Merge "Tethering: check if configManager is null" am: e011bf80c5 am: d1e4dbf002 
am: d33a0ee710

Change-Id: I2d8cfac1093b6973b2b5f06e2ba37cff9866d82a
 2016-10-14 14:23:56 +00:00
Brad Ebinger
be243f5b84 Merge "Transplant the Logging system from Telecom" am: cbb03d1ad3 am: 951dca8209 
am: 0ab9a078e9

Change-Id: I79e6b2de4bf523036ed1d15debd142a1786249c5
 2016-10-14 14:22:38 +00:00
Christopher Wiley
5f9fedc5d7 Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc am: eedd2b529d 
am: 53d12379f4

Change-Id: I4bcde8dde8c3bad7754e26dd56f8321032daa5a3
 2016-10-14 14:21:39 +00:00
John Reck
11cbf7b830 Merge "Fix SurfaceViewPositionListener race bugs" am: 2dc11c0500 am: ee3adf6d91 
am: f136fa872f

Change-Id: Ifd944500fb75bdefa30e0f083e26b0de2cc1cb3a
 2016-10-14 14:20:42 +00:00
Andre Eisenbach
9c45a3184e Merge "List HF_INDICATORS_VALUE_CHANGED broadcast as protected" am: 5c043f51b0 am: 3c3329bd34 
am: d6a85bdea3

Change-Id: Id01a44e2424cb71b7ab89592d84de272b25ae0fe
 2016-10-14 14:19:49 +00:00
Andreas Gampe
34030a16ba Merge "Debug: Use UniqueFile" am: 546f755bf8 am: 8d151b26c2 
am: 77a2f22f77

Change-Id: Ib904c45f715b742f3cd78c54c9bddbda1dc0946b
 2016-10-14 14:18:58 +00:00
Selim Cinek
b05ceb233e Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours am: 00c553e1ba -s ours 
am: 8f681f7220

Change-Id: Ic3fe3a5021097097a3b818040e046de1e9011941
 2016-10-14 14:17:58 +00:00
lei.peng
167f01a13a Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1 am: 93c75d07c1 
am: d975003af3

Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206
 2016-10-14 14:17:07 +00:00
Stephen Li
85f037acd0 Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master am: 6accb573ab 
am: 7cbe133507

Change-Id: I7f1aa17fecc22655a80ddc993786fa77039fa71b
 2016-10-14 14:16:15 +00:00
Jordan Liu
e979b73f77 Add cdma_3waycall_flash_delay key to CarrierConfig am: e5535d71fc 
am: 90c20a884d

Change-Id: Iea5e694e0cafc74f2c17286737ce22403f39f0e7
 2016-10-14 14:15:26 +00:00
Stephen Li
2f459f1c0a 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
 2016-10-14 14:14:26 +00:00
Robert Sesek
9a7c9a51f6 Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 
am: adb4389cc1

Change-Id: Ic031be1b1efa6fc5555ad02a4e00f810213deda9
 2016-10-14 14:13:27 +00:00
Robert Sesek
856a791ddd Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-10-14 14:08:00 +00:00